MergeTry
MergeTry
v1.1 KK merge
Merge branch 'master' of https://github.com/ssinghvi/SDO-Tools

Conflicts:
	app/controllers/customizer/customizer_controller.rb