ChangeLog
Merge branch 'master' of github.com:nessatse/radstock

Conflicts:
	ChangeLog
Updated with local changes/additions