Merge branch 'develop' into staging
Merge branch 'develop' into staging

Conflicts:
	demo/css/core.less
	demo/css/global.less
	demo/css/nav.less
	demo/includes/sql/db_con.php
	demo/includes/template/nav.php
	demo/index.php
	demo/js/core.js
fix sidebar variabke name
fix task save
fix javascript get script
Merge branch 'staging' into develop

Conflicts:
	demo/css/core.less
	demo/css/global.less
	demo/index.php
Merge branch 'mporam' into develop

Conflicts:
	demo/css/nav.less
fix search box js and css