stuff
Merge branch 'master' of https://github.com/cdelguercio/squiiid

Conflicts:
	squiiid/templates/image_details.html