Fixed compile error
Merge branch 'master' into evaluation

Conflicts:
	WebSite/app/main.js