context
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/seca2/bootstrap/Bootstrap.java
	src/main/java/seca2/bootstrap/module/User/UserModule.java