added rails_12factor gem to fix production issues
removed jquery and jquery ui from vendor folder and added jquery-ui-sass-rails instead
Timekeepers can not put members of their own squad onto any calendar
Merge branch 'master' into run_records

Conflicts:
	Gemfile
	Gemfile.lock