final edits!
Merge branch 'master'

Conflicts:
	mentex/config/navigation.rb
final?