added to admin
Merge branch 'master' of https://github.com/amauboussin/forage

Conflicts:
	api/views.py
	api/views.pyc