Added django-admin-bootstrapped==2.3.1
Merge branch 'develop' of https://github.com/Collederas/DeviceX into develop

Conflicts:
	src/main/settings.pyc