Don't apply the reset to all children.
Merge branch 'hotfix/0.5.2'
Merge tag '0.5.2' into develop

0.5.2

Conflicts:
	bower.json
	package.json