Dev: adding the timetrack
Moving forward with timetrack
Timetrack: one step closer
Merge branch 'Development' into GON-27

Conflicts:
	Gemfile.lock
	db/schema.rb