Added admin panel
Merge branch 'admin'

Conflicts:
	app.py