junit for controller
Merge branch 'master' of https://github.com/pc-rnukala/proximityperks

Conflicts:
	src/main/resources/proximityperks-data.xml