style merging
Merge branch 'master' of https://github.com/earthlinkdesign/ihs

Conflicts:

t3-assets/dev/t3/4a4210cc5bce999c5e6c384e59347478-cache-t3-debe22c516ecd
93a700d01df70ea0d7d.php