Admin page working
Merge branch 'master' of https://github.com/dugusword/iNventory

Conflicts:
	iNventory/db.sqlite3