Debugging AdminTest
Merge remote-tracking branch 'origin/master'

Conflicts:
	DDtroops/src/main/java/com/pa165/ddtroops/entity/Admin.java