#5: delete vendor bundle, change deployment configures
 Merge branch '5_blog' of github.com:smoothcorp/my5 into 5_blog

Conflicts:
	app/views/my5/dashboard/customer.html.haml