add 'django.contrib.admin' in INSTALLED_APPS
changes after merge
Merge branch 'master' of https://github.com/Alivebox/aliveTracker_ws
Merge branch 'master' of https://github.com/Alivebox/aliveTracker_ws
Incomplete rest-framework implementation