initial commit (generated with RailsBricks v2.0.5)
Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
added token authentication and tenants
added index on subdomain to tenants
API works with Warden authentication
API authentication
Add time_zone to users, created org model, setup relationships
tests
add membership and orgs
convert to omniauth with devise
fixes for omniauth/devise
fixes for sign out
made devise key on emails instead of usernames
since removed devise confirmation, fixing tests
fix some admin screens
make it prettier
tenant membership testing
added error handling
added error handling