Polish and fixed a few links
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main/src/english.properties
	Main/web/bug.jsp
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Index.jsp is up to date
Merge remote-tracking branch 'origin/master'