Some configurations
Some configurations
Merge branch 'master' of https://github.com/DrunkDragonGames/brainwars

Conflicts:
	web/src/main/webapp/WEB-INF/spring/applicationContext-security.xml