Update by Mawin
Merge branch 'master' of https://github.com/intelhat/KMASSESSMENT

Conflicts:
	HARDCODE/indicators/2557_1/2557_1.php
	HARDCODE/indicators/2557_1/save.php
	HARDCODE/script/config_database.php
by Mawin