Image loader
Merge branch 'master' of github.com:caioviel/pyannotator

Conflicts:
	model/__init__.py
	model/__init__.pyc
__init__ remerged.