i
Merge branch 'master' of https://github.com/alenoir/instamoz

Conflicts:
	instapix/models.pyc
Merge branch 'master' of https://github.com/alenoir/instamoz
i
Merge branch 'master' of https://github.com/alenoir/instamoz

Conflicts:
	instapix/admin.pyc
	instapix/models.py
	instapix/models.pyc