Updated arena with new functionality
Restructured jsp files
Merge branch 'master' of github.com:chrisn21/team6

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.team6/app/pom.properties
Updated arena controller redirects