commit all
Merge rmapGithub/master

Conflicts:
	src/main/webapp/scripts/constants.js
	src/main/webapp/views/error.html
	src/main/webapp/views/main.html
Merge rmapGithub/master

Conflicts:
	src/main/webapp/scripts/constants.js
	src/main/webapp/views/error.html
	src/main/webapp/views/main.html
commit all