.
Merge branch 'master' of https://github.com/soleasahi/ngservice.git

Conflicts:
	src/main/resources/config/applicationContext.xml
	src/test/resources/Configuration.xml