add custom text, navbar
Merge branch 'master' of github.com:internetchris/apicon-customer

Conflicts:(fixed)
	client/index.ejs