form validation
conflicts
conflicts (again)
conflicts
verify email with ajax
Merge branch 'francois-branch'
Initialised Restaurants pages and controller
Few changes, fixed misc migration 005
Enhanced restaurants
Merge branch 'master' of https://github.com/Prismik/pepito-pizzeria
Merge branch 'master' of https://github.com/Prismik/pepito-pizzeria

Conflicts:
	views/register.jade
	views/users/update.jade
Updated the order confirmation page
Merge remote-tracking branch 'origin' into philippe-branch
Order complete
BROKE SMURF
Added mail sending
Format package
Default address support
Added default address when changing in combobox
Fixed pizza icon size