Add image upload js
Merge branch 'master' of https://github.com/itagakishintaro/EmotionLifeLog

Conflicts:
	app/View/Emotions/add.ctp
	app/webroot/js/ell.js