WS
Merge branch 'staging' into production
Updating production cap config
add tests for work_units_controller permissions
remove remote on work unit form
add ajax-form to ninjascript ajax request
WS
Merge branch 'master' into staging
Updating staging deploy config
Replicating to production deploy
WS
Merge branch 'staging' into production

Conflicts:
	config/deploy/production.rb
Merge branch 'fixing_manual_work_unit_creation' of github.com:TimePulse/TimePulse
Adding a longer timeout to poltegeist
Merge remote-tracking branch 'upstream/master'