Major refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/resources/application-test.properties
Allowed bean method to throw exceptions. Reviewed logging configuraton.
Merge remote-tracking branch 'origin/master'