Added theming functions for message / notification count
Correct icon for messages
Rename template
Also change text in bootstrap
Merge branch 'develop' into feature/cep-2.0