rework time
Merge branch 'master' of github.com:formstamp/formstamp

Conflicts:
	src/coffee/time.coffee
	src/coffee/timeFormat.coffee