changed navbar title
Merge branch 'master' into slave

Conflicts:
	index.html