use api call to authenticate users
Merge branch 'master' of github.com:mantacode/manta-rails-hack

Conflicts:
	Gemfile.lock
	db/schema.rb