End 2 end (hard coded for now) image upload to dropbox

Conflicts:
	public/index.html
	public/js/app.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.html
	public/js/app.js