Remove configure from repo as generated by autoconf.sh
Update ChangeLog
Merge branch 'master' into develop

Conflicts resolved:
	ChangeLog
ChangeLog modified