Merge branch 'master' of https://github.com/dream-akasa/sman1kutasari

Conflicts:
	system/logs/error.log