more updates
Merge branch 'gh-pages' of https://github.com/MokiMobility/MokiManageSDK into gh-pages

Conflicts:
	Content/Resources/mm.css
	Content/ios_aem.htm
	index.htm