CHANGELOG sync

1.1 now planned for 2013-10-21
Merge branch 'master' of https://github.com/TheThingSystem/steward

Conflicts:
	CHANGELOG.md