user management
Merge branch 'master' of https://github.com/ra192/myRepo.git

Conflicts:
	myShop/app/controllers/UserController.scala
	myShop/app/service/SocialUserService.scala
	myShop/app/views/user/editUser.scala.html
	myShop/app/views/user/listUsers.scala.html