*fixed tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/time_tracker.rb
	test/functional/time_trackers_controller_test.rb