read properties from app.properties file
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/mindbar/scorey/controller/ScoreyController.java
	src/main/resources/app.properties
Merge remote-tracking branch 'origin/master'