asdf
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/config.properties
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
ganti query spesial appraisal