Upgrade Rails
Don't break if permission is broken
Make sure CheckBoxFields actually save correctly if they are default-true
Merge branch 'master' into ember

Conflicts:
	Gemfile.lock
Add rails-api for API controllers