merge
Merge remote-tracking branch 'origin/feature-reactive-buttons' into feature-reactive-buttons

Conflicts:
	core/icons.html
add touch handling on element