Merge branch 'master' into branch3

Conflicts:
	app/views/restaurants/edit.html.erb
	app/views/restaurants/new.html.erb
styling
trying to merge with master
last form orderproducts bootstraped
Merge pull request #83 from toannguyenle/branch3

Branch3