20141223

PROD oceanic
Merge remote-tracking branch 'origin/master'

Conflicts:
	footer.php
	front-page.php