Signed-off-by: Leon Lau <leondotlau@gmail.com>
fixed git
Merge branch 'development'

Conflicts:
	app/controllers/home_controller.rb
	app/models/shop.rb

Signed-off-by: Leon Lau <leondotlau@gmail.com>