Update Changelog

Conflicts:
	src/main/resources/change_log.txt