as
Merge branch 'master' of git@github.com:goutam4000ad/picletta.git

Conflicts:
	studio/js/picletta-main.js
	studio/uploadimage/Thumbs.db