Changes to Side Nav
Merge branch 'gh-pages' of https://github.com/MokiMobility/MokiManageSDK into gh-pages

Conflicts:
	app/js/app.js
	app/partials/nav.html