preserves my changes
Merge branch 'master' of github.com:speculoos/after-the-walls

Conflicts:
	atw/templatejs/templates/register-widget.html
	static/style/style.less