fixed highlight issue with new lines #776
Merge branch 'develop' into hotfixes

Conflicts:
	oc-includes/osclass/helpers/hUtils.php
limit access to advanced settings and locations with DEMO flag defined as true
updated google analytics fix
Merge branch 'hotfixes' into develop
fixed #857
Merge branch 'issue-857' into develop
updated gmaps
Merge branch 'hotfixes' into develop
use Grunt to compile sass bender theme
Compressed Main stylesheet
Ignore .sass-cache
add compass variable
removed DS_store and css files
use Grunt to compile sass bender theme, add compass variable
Ignore .sass-cache
Compressed Main stylesheet
removed DS_store and css files
Fixes global.css to main.css
Fixes global.css to main.css