Changes in views, html files
Merge branch 'master' of https://github.com/technomicssolutions/technomics-site
Changes in header.html
Conflicts resolved
Merge branch 'master' of https://github.com/technomicssolutions/technomics-site