Remove admin.py from configuration directory
Merge remote-tracking branch 'origin/develop' into develop