Updated admin panel
Merge branch 'master' of github.com:iaefai/Buchladen

Conflicts:
	store/views/other.py