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 projects archive interface
Fix editing time log entry - the time refreshes now
Update active flag in participations to true
Merge branch 'master' of github.com:amberbit/KarmaTracker
Add api test for pagination active/archived projects.
Finish fixing projects archivization
Merge branch 'feature/59084688_archiving_project_fixes'
Merge branch 'master' of https://github.com/amberbit/KarmaTracker

Conflicts:
	app/controllers/api/v1/projects_controller.rb
Remove selenium driver from test
Merge branch 'master' of github.com:amberbit/KarmaTracker
sec responsesn xml to json
change pivotal tracker test to v5
pivotaltracker integration using json