upload 1
file upload continue, bootstrap checkbox
continue image
picture shared items continue
upload pic finito.
Merge branch 'master' of github.com:soad003/flatman

Conflicts:
	app/assets/javascripts/controller/share.js
	app/assets/javascripts/controller/shareditem.js
	app/assets/javascripts/services/share.js