recherche by user
Merge branch 'master' of https://github.com/alandomiel/ProjetGMIN303

Conflicts:
	Tweeter/app/controllers/Application.java