starting to remove subtimes model
caching completed tasks
removing sub_times
adding migration for removal of subtimes
summary and reports in
created_at task editable
Updating rails
Merge branch 'removing_subtimes'

Conflicts:
	Gemfile.lock
	public/assets/application.js.gz
	public/assets/best_in_place.js.gz
	public/assets/facebox.css.gz
	public/assets/facebox.js.gz
	public/assets/jquery-ui-1.8.23.custom.css.gz
	public/assets/jquery-ui-timepicker-addon.js.gz
	public/assets/jquery-ui.js.gz
	public/assets/jquery-ui.min.js.gz
	public/assets/jquery.js.gz
	public/assets/jquery.min.js.gz
	public/assets/jquery.purr.js.gz
	public/assets/jquery.timepickr.css.gz
	public/assets/jquery_ujs.js.gz
	public/assets/print.css.gz
	public/assets/sass/print.css.gz
	public/assets/sass/styles.css.gz
	public/assets/scaffold.css.gz
	public/assets/styles.css.gz
	public/assets/ui.timepickr.css.gz
Gemfile.lock