basic img working
adding icons
Merge branch 'master' of https://github.com/brotherclone/imaginary

Conflicts:
	db/development.sqlite3