minor updates
Merge branch 'master' of https://github.com/abeiro/ascore-v1

Conflicts:
	Apps/Demo/gspanel_class.php