dev update
Merge branch 'master' of github.com:cipriota/revHome

Conflicts:
	revHome-server/WebContent/js/revhome.js