changed compiler
Merge branch 'master' of github.com:ssachtleben/herowar

Conflicts:
	bin/controllers/Signup.class