=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/Setting.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/Setting.java	2015-10-09 10:56:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/Setting.java	2015-10-09 10:59:01 +0000
@@ -30,7 +30,6 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml	2015-10-09 10:49:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml	2015-10-09 10:59:01 +0000
@@ -46,7 +46,7 @@
 	<set name="corsWhitelist" table="configuration_corswhitelist">
 		<cache usage="read-write" />
 		<key column="configurationid" foreign-key="fk_configuration_corswhitelist" />
-    	<element type="string" column="corswhitelist" />
+		<element type="string" column="corswhitelist" />
 	</set> 
 	
   </class>