Merge branch 'release/v1.2.4-constellation'
Update README.md
Update Locales
Prepare API for timesheet backbone app, Fix minor Bugs
Bump version
Bump version
Merge branch 'release/v1.2.6-constellation'

Conflicts:
	app/controllers/api/tasks_controller.rb
	app/controllers/api/timers_controller.rb
	app/serializers/task_serializer.rb
	config/routes.rb
	config/version.rb