json and header

updaes in JSON and header
Merge branch 'master' of https://github.com/berryny/jsapp

Conflicts:
	mobilecme/tpl/nav.html