test
Merge branch 'master' of https://github.com/tepani/testaja

Conflicts:
	application.properties