Different date format
Merge commit '5d4f3d5b0c074710d0c36a6f130954534bb4acee'

Conflicts:
	site/js/whileaway.js
Merge commit 'a162c403636cfc655c996e3e1746da4ff0f84351'