Merge branch 'master' of github.com:jainsh/help_me_choose

Conflicts:
	app/models/usage_profile.rb
Merge branch 'master' of github.com:jainsh/help_me_choose