inspector + menage
Merge branch 'master' of https://github.com/fitzlucassen/Opiaro

Conflicts:
	Library/Core/dispatcher.php