fix javascript coding style
Merge branch 'master' of github.com:tmorin/memos

Conflicts:
	Gruntfile.js