Customer Service page complete
Merge branch 'dev' of https://github.com/skeep/DiscoveryTemp into dev