log4j
create app
Merge remote-tracking branch 'master/master'

Conflicts:
	src/mx/controller/HomeController.java
	src/mx/controller/UserController.java