Merge branch 'upstream' into dev

Conflicts:
	fiber/rest_api/views.py
Merge remote-tracking branch 'upstream/dev' into dev
Merge branch 'master' into dev

Conflicts:
	fiber/rest_api/views.py
Start works compitable grappelli
added locale files to manufest
Improvements for compatibility with django-grappelli
Added customer class to show_content tags
added imagestore tags
modify compitable Grappelli
modified:   fiber/admin.py
modified:   fiber/static/fiber/js/admin.js
Merge branch 'dev' of github.com:grengojbo/django-fiber into dev
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	fiber/models.py
	fiber/rest_api/urls.py
	fiber/rest_api/views.py
merge upstream
modify fiber templates
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	fiber/models.py
	setup.py
modify fiber templates
merge #162
Bumped version numbers to post-release.
Upgraded Django REST Framework to 2.3.6
Merge branch 'dev'
Bumped version numbers to 0.10.4