=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm	2015-03-30 14:13:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm	2015-03-30 14:15:12 +0000
@@ -36,9 +36,9 @@
 
 <div class="setting">
 <select id="cacheStrategy" name="cacheStrategy">
-	<option value="NO_CACHE" #if( $keyCacheStrategy == "NO_CACHE" )selected="selected"#end>$i18n.getString( "no_cache" )</option>
-	<option value="CACHE_6AM_TOMORROW" #if( $keyCacheStrategy == "CACHE_6AM_TOMORROW" )selected="selected"#end>$i18n.getString( "cache_until_6am_tomorrow" )</option>
-	<option value="CACHE_TWO_WEEKS" #if( $keyCacheStrategy == "CACHE_TWO_WEEKS" )selected="selected"#end>$i18n.getString( "cache_for_two_weeks" )</option>
+    <option value="NO_CACHE" #if( $keyCacheStrategy == "NO_CACHE" )selected="selected"#end>$i18n.getString( "no_cache" )</option>
+    <option value="CACHE_6AM_TOMORROW" #if( $keyCacheStrategy == "CACHE_6AM_TOMORROW" )selected="selected"#end>$i18n.getString( "cache_until_6am_tomorrow" )</option>
+    <option value="CACHE_TWO_WEEKS" #if( $keyCacheStrategy == "CACHE_TWO_WEEKS" )selected="selected"#end>$i18n.getString( "cache_for_two_weeks" )</option>
 </select>
 </div>
 
@@ -46,10 +46,10 @@
 
 <div class="setting">
 <select id="analyticsMaxLimit" name="analyticsMaxLimit">
-	<option value="50000" #if( $keyAnalyticsMaxLimit == "50000" )selected="selected"#end>50 000</option>
-	<option value="100000" #if( $keyAnalyticsMaxLimit == "100000" )selected="selected"#end>100 000</option>
-	<option value="200000" #if( $keyAnalyticsMaxLimit == "200000" )selected="selected"#end>200 000</option>
-	<option value="0" #if( $keyAnalyticsMaxLimit == "0" )selected="selected"#end>$i18n.getString( "unlimited" )</option>
+    <option value="50000" #if( $keyAnalyticsMaxLimit == "50000" )selected="selected"#end>50 000</option>
+    <option value="100000" #if( $keyAnalyticsMaxLimit == "100000" )selected="selected"#end>100 000</option>
+    <option value="200000" #if( $keyAnalyticsMaxLimit == "200000" )selected="selected"#end>200 000</option>
+    <option value="0" #if( $keyAnalyticsMaxLimit == "0" )selected="selected"#end>$i18n.getString( "unlimited" )</option>
 </select>
 </div>
 
@@ -57,17 +57,17 @@
 
 <div class="setting">
 <select id="databaseServerCpus" name="databaseServerCpus">
-	<option value="0">$i18n.getString( "automatic" ) ($i18n.getString( "detect_based_on_web_server" ))</option>
-	<option value="1" #if( $keyDatabaseServerCpus == "1" )selected="selected"#end>1</option>
-	<option value="2" #if( $keyDatabaseServerCpus == "2" )selected="selected"#end>2</option>
-	<option value="3" #if( $keyDatabaseServerCpus == "3" )selected="selected"#end>3</option>
-	<option value="4" #if( $keyDatabaseServerCpus == "4" )selected="selected"#end>4</option>
-	<option value="5" #if( $keyDatabaseServerCpus == "5" )selected="selected"#end>5</option>
-	<option value="6" #if( $keyDatabaseServerCpus == "6" )selected="selected"#end>6</option>
-	<option value="7" #if( $keyDatabaseServerCpus == "7" )selected="selected"#end>7</option>
-	<option value="8" #if( $keyDatabaseServerCpus == "8" )selected="selected"#end>8</option>
-	<option value="16" #if( $keyDatabaseServerCpus == "16" )selected="selected"#end>16</option>
-	<option value="32" #if( $keyDatabaseServerCpus == "32" )selected="selected"#end>32</option>
+    <option value="0">$i18n.getString( "automatic" ) ($i18n.getString( "detect_based_on_web_server" ))</option>
+    <option value="1" #if( $keyDatabaseServerCpus == "1" )selected="selected"#end>1</option>
+    <option value="2" #if( $keyDatabaseServerCpus == "2" )selected="selected"#end>2</option>
+    <option value="3" #if( $keyDatabaseServerCpus == "3" )selected="selected"#end>3</option>
+    <option value="4" #if( $keyDatabaseServerCpus == "4" )selected="selected"#end>4</option>
+    <option value="5" #if( $keyDatabaseServerCpus == "5" )selected="selected"#end>5</option>
+    <option value="6" #if( $keyDatabaseServerCpus == "6" )selected="selected"#end>6</option>
+    <option value="7" #if( $keyDatabaseServerCpus == "7" )selected="selected"#end>7</option>
+    <option value="8" #if( $keyDatabaseServerCpus == "8" )selected="selected"#end>8</option>
+    <option value="16" #if( $keyDatabaseServerCpus == "16" )selected="selected"#end>16</option>
+    <option value="32" #if( $keyDatabaseServerCpus == "32" )selected="selected"#end>32</option>
 </select>
 </div>
 
@@ -115,10 +115,10 @@
 
 <div class="setting">
 <select id="feedbackRecipients" name="feedbackRecipients">
-	<option value="-1">$i18n.getString( "no_feedback_recipients" )</option>
-	#foreach ( $group in $userGroups )
-	<option value="$group.id" #if( $group.id == $!feedbackRecipients.id )selected="selected"#end>$encoder.htmlEncode( $group.name )</option>
-	#end
+    <option value="-1">$i18n.getString( "no_feedback_recipients" )</option>
+    #foreach ( $group in $userGroups )
+    <option value="$group.id" #if( $group.id == $!feedbackRecipients.id )selected="selected"#end>$encoder.htmlEncode( $group.name )</option>
+    #end
 </select>
 </div>
 
@@ -127,33 +127,33 @@
 <div class="setting">
 <select id="offlineOrganisationUnitLevel" name="offlineOrganisationUnitLevel">
     #set( $level = 1)
-	#foreach ( $organisationUnitLevel in $organisationUnitLevels )
+    #foreach ( $organisationUnitLevel in $organisationUnitLevels )
     <option value="$organisationUnitLevel.id" #if( $organisationUnitLevel.id == $!offlineOrganisationUnitLevel.id)selected="selected"#end>${level}</option>
     #set( $level = $level + 1)
-	#end
+    #end
 </select>
 </div>
 
 <div class="settingLabel">$i18n.getString( "system_notifications_email_address" )</div>
 <div class="setting">
-	<input type="text" id="systemNotificationsEmail" name="systemNotificationsEmail" value="$!keySystemNotificationsEmail"/>
+    <input type="text" id="systemNotificationsEmail" name="systemNotificationsEmail" value="$!keySystemNotificationsEmail"/>
 </div>
 
 <div class="settingLabel">$i18n.getString( "data_analysis_factor" )</div>
 <div class="setting">
-	<input type="text" id="factorDeviation" name="factorDeviation" value="$!factorDeviation"/>
+    <input type="text" id="factorDeviation" name="factorDeviation" value="$!factorDeviation"/>
 </div>
 
 <div class="settingLabel">$i18n.getString( "phone_number_area_code" )</div>
 
 <div class="setting">
-	<input type="text" id="phoneNumberAreaCode" name="phoneNumberAreaCode" value="$!phoneNumberAreaCode"/>
+    <input type="text" id="phoneNumberAreaCode" name="phoneNumberAreaCode" value="$!phoneNumberAreaCode"/>
 </div>
 
 <div class="settingLabel">$i18n.getString( "help_page_link" )</div>
 
 <div class="setting">
-	<input type="text" id="helpPageLink" name="helpPageLink" value="$!helpPageLink"/>
+    <input type="text" id="helpPageLink" name="helpPageLink" value="$!helpPageLink"/>
 </div>
 
 <div class="settingLabel">$i18n.getString( "server_base_url" )</div>
@@ -165,7 +165,7 @@
 <div class="settingLabel">$i18n.getString( "google_analytics_ua_key" )</div>
 
 <div class="setting">
-	<input type="text" id="googleAnalyticsUA" name="googleAnalyticsUA" value="$!googleAnalyticsUA"/>
+    <input type="text" id="googleAnalyticsUA" name="googleAnalyticsUA" value="$!googleAnalyticsUA"/>
 </div>
 
 <div class="setting">