added picture upload and move picture support
merged andy's pic uploading and moving with haotian's bucketing

Merge branch 'master' of https://github.com/haotianwang/CanvUs

Conflicts:
	app/assets/javascripts/uiModule.js