Edit test properties
merge
server-side test support
Merge branch 'back-end' of
https://github.com/smartcampuslab/smartcampus.openservices into back-end

Conflicts:
	src/main/webapp/WEB-INF/resources/js/directives.js