backup
Merge branch 'Pulsar#8-ui'

Conflicts:
	src/wap/views/test.ui