Synced with Current QA Server
Merge branch 'master' of https://github.com/Inkriti-Digital/sju-theme

Conflicts:
	css/ink-extends.css
	js/.DS_Store
	js/main.js
	page-home.php
	single-magis.php