Split configuration file
Merge branch 'master' into spring-security

Conflicts:
	src/main/resources/spring-config.xml
add spring security file