Merge pull request #14 from burrows-codefest/feature-move_meme_inline

Memes
Quick date fix
Merge branch 'develop' into feature-move_meme_inline

Conflicts:
	public/scripts/directives/memeCreator.js