Layout modified
Layout changed - merge
queue up s3 uploads and do them async using retask
fix the order
add image back to queue if upload fails
Layout changed - ready to merge
Merge branch 'develop' of github.com:hasgeek/imgee into develop
revert using retask
Merge branch 'master' into develop

Conflicts:
	imgee/templates/show_label.html
	imgee/templates/view_image.html
	imgee/views/index.py