some admin page features
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/static/js/app_admin.js