start making changes in Service. WARNING - app is not stable.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/META-INF/application-context.xml