Add tags
Add image uploader and delete many files
Merge branch 'master' of github.com:ma3tk/viral

Conflicts:
	config/database.yml