merging animation + buttons
Merge branch 'merge'

Conflicts:
	Client_salle/app/index.html
	Client_salle/app/js/directives.js
	Client_salle/app/partials/pizza-list.html
no message
Revert "no message"

This reverts commit d668a0f74d4f7df65477f46cc245390fca65a7a9.