Second try.
Merge branch 'master' of github.com:daoli/lunch

Conflicts:
	lunch/reservation/views.py
Merge branch 'master' of github.com:daoli/lunch

Conflicts:
	lunch/reservation/views.py
Merge branch 'master' of github.com:daoli/lunch
Merge branch 'master' of github.com:daoli/lunch
Hurry up!