Navigation changes
Merge branch 'master' of https://github.com/superphly/tm

Conflicts:
	library/css/style.css
Merge branch 'master' of https://github.com/superphly/tm