update changelog
update changelog

Conflicts:
	CHANGELOG

asoltys/active_scaffold,BookingBug/active_scaffold,silverpond/active_scaffold,silverpond/active_scaffold,BookingBug/active_scaffold,asoltys/active_scaffold,BookingBug/active_scaffold,silverpond/active_scaffold