Disable watchposition when needed
Merge branch 'development'
build dev
Merge branch 'development'

Conflicts:
	dist/manifest.appcache
build prod
build fox
Add css padding to switches
build dev
Merge branch 'development'

Conflicts:
	dist/manifest.appcache
build prod