Fix null pointer exception with date
Fix null pointer exception with date
Fix null pointer exception with date
Merge branch 'master' of heroku.com:testshark

Conflicts:
	.gitignore