updates gemfile to ruby 2.1.2
changes has_one to belongs_to
changes company migration to belong_to :user
rewards prototype
refactor admin controller structure
custommers controller added
Merge branch 'master' of github.com:akulisek/LocalHero

Conflicts:
	app/controllers/admin_controller.rb
	app/views/admin/campaigns.html.erb
	app/views/admin/custommers.html.erb
	app/views/admin/index.html.erb
	app/views/admin/profile.html.erb
	app/views/admin/settings.html.erb
	app/views/admin/support.html.erb
	db/schema.rb
blank change
merged unresolved conflicts from admin