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
fixed #857
updated gmaps
use Grunt to compile sass bender theme
Compressed Main stylesheet
Ignore .sass-cache
add compass variable
removed DS_store and css files
Fixes global.css to main.css
issue #863
mini fix
issue #860
issue #864 and some minor fixes
added two filters
added a new filter in search conditions
issue #869 needs some styling
issue #853 permalinks have to been saved again to make this work correctly