Refs implemented S3
Merge branch 'master' of https://github.com/aremnev/imagerate

Conflicts:
	views/images/show.ect