part of Tournament implementation
Merge remote-tracking branch 'origin/master'

Conflicts:
	battlecoders-Web/src/main/java/com/battlecoders/web/controller/AdministrationController.java
part of Tournament implementation