Fix date issues [fixes #97, fixes #73]

Conflicts:
	config/locales/en.yml