Got rid of useless stuff
Merge branch 'master' of https://github.com/pkabra/mpowered-manager

Conflicts:
	application/views/nav.php