Merge origin/master

Conflicts:
	BraveHackers/src/main/webapp/index.jsp