Changed dates to unix timestamps
Merge branch 'master' of https://github.com/f4nky/ch.bfh.smojeWeb

Conflicts:
	wp-content/themes/smoje/js/googleMaps.js