Upgrade gems to Rails 4
Add json serializer and mapper to work units. 

Added json_spec to Gemfile. There is a problem with accepting both params and json strings in a post create that would probably be solved by updating to Rails 4. Should come back to this branch when the update is complete.
Fix merge conflicts
Rails 4 upgrade

Also includes json api
Upgrade to Rails 4
Merge branch 'rails_4' of github.com:TimePulse/TimePulse into rails_4
Fix merge conflicts
Add missing end to work units controller spec
Remove jwt 0.1.12 for 0.1.11

jwt 0.1.12 no longer exists.
Fix deprecation
WS fixes
Merge branch 'rails_4' of github.com:TimePulse/TimePulse

Conflicts:
	Gemfile
	Gemfile.lock