bug fixes
Merge pull request #6 from mstarinteractive/bug-fixes

bug fixes
Merge branch 'master' of https://github.com/mstarinteractive/django-mobile-framework into tests

With bug fixes after merge.

Conflicts:
	mobile_framework/core/permissions.py
	mobile_framework/user/serializers.py