FIXD
Merge origin/master

Conflicts:
	src/main/webapp/resources/script.js