max. menu + admin
Create Order. Without date and table
Merge branch 'master' of https://github.com/Lotforlife/vedroObedov

Conflicts:
	app/views/users/index_err.jade
	assets/css/vendor/bootstrap/css/bootstrap.css
	config/routes.coffee
Nik com2
samofix
Merge branch 'master' into lex
bagofix