Commented out local url settings
Merge branch 'master' of https://github.com/web-create/harmony
Fix 404 issue on home link under post layout
Merge remote-tracking branch 'upstream/master'
Fix conflicts