sada
Merge branch 'master' of https://github.com/khazad123/PlanetHunters.git

Conflicts:
	scr/main/java/com/planethunters/web/StartController.java
	scr/main/webapp/META-INF/context.xml