Fixed homepage
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/designer_controller.rb
Fixed homepage