Release 1.5.0
Merge branch 'master' into leading_zeroes

Conflicts:
	jquery.timeentry.js