Updated views
Merge branch 'master' of https://github.com/guillaumeguerin/pop-pop

Conflicts:
	site/src/Yabe/MainBundle/Controller/AmazonController.php