Merge branch 'master' of https://github.com/songgz/shopror

Conflicts:
	app/views/layouts/application.html.erb