Merge
Merge branch 'master' of github.com:amberbit/KarmaTracker
Fix some tests
Merge branch 'master' of github.com:amberbit/KarmaTracker

Conflicts:
	Gemfile.lock
	spec/api/projects_api_spec.rb
Merge branch 'master' of github.com:amberbit/KarmaTracker
gem update
Merge branch 'master' of github.com:amberbit/KarmaTracker
Fix editing time log entry - the time refreshes now
Merge branch 'master' of github.com:amberbit/KarmaTracker