Merge branch 'refs/heads/dev'
Also rename the files, silly
typo
Laughing Werner
Filename fix
Merge branch 'dev' of https://github.com/dewey/Melvin into dev

Conflicts:
	Emoticons.plist