prod changes
resolving header.php conflict
Merge branch '2.0' of github.com:fission-strategy/fissionstrategy.com into 2.0