Merge branch 'master' of https://github.com/alyaros/BugVilla

Conflicts:
	src/main/java/com/bugvilla/bug/web/BugController.java
	src/main/java/com/bugvilla/product/web/ProductController.java
	src/main/java/com/bugvilla/user/commands/UpdateUserCommand.java
	src/main/java/com/bugvilla/user/domain/User.java
	src/main/java/com/bugvilla/user/service/UserServiceImpl.java
	src/main/java/com/bugvilla/user/web/UserController.java