working cookie passing but broken auth_cookie
simplified with encoding done serverside
working auth and session passing
added branch headers to api request if branch is available
add test server to api headers if available
allow original ip to be forwarded to the api
make api_session_id available to consuming app
changes to reflect removal of api path prefix on backend
Merge branch 'master' into for_rails_engine

Conflicts:
	lib/mls/models/account.rb
	lib/mls/models/photo.rb
	test/test_helper.rb