Start adding schedule editing
Merge remote-tracking branch 'origin/master'

Conflicts:
	release/bookingbug-angular.js
	src/person-table/javascripts/person_table.js.coffee