fixes
Merge branch 'develop'

Conflicts:
	main/grails-app/conf/BuildConfig.groovy
	main/grails-app/conf/Config.groovy
	main/grails-app/conf/UrlMappings.groovy
	main/grails-app/controllers/main/PagesController.groovy
	main/grails-app/views/pages/cassidian.gsp
	main/grails-app/views/pages/clients.gsp
	main/grails-app/views/pages/contactUs.gsp
	main/grails-app/views/pages/elayaway.gsp
	main/grails-app/views/pages/hero.gsp
	main/grails-app/views/pages/index.gsp
	main/grails-app/views/pages/measured-progress.gsp
	main/grails-app/views/pages/nike.gsp
	main/grails-app/views/pages/projects.gsp
	main/grails-app/views/pages/trilybrinth.gsp
	main/grails-app/views/templates/_mainheader.gsp
	main/web-app/css/bootstrap.css
	main/web-app/css/bootstrap.min.css
	main/web-app/css/external-pages.css
	main/web-app/css/theme.css
	main/web-app/less/clients.less
	main/web-app/less/common.less
	main/web-app/less/contact.less
	main/web-app/less/footer.less
	main/web-app/less/header.less
	main/web-app/less/home.less
	main/web-app/less/projects.less
	main/web-app/less/style.less