- Fitxa cocktail individual
- Llistat cocktails d'un usuari
- server_controller.js
Merge branch 'bestCocktails'

Conflicts:
	assets/www/javascripts/controllers/cocktails_controller.js
Merge branch 'master' of https://github.com/johnny32/ada-client