.
Merge branch 'master'
.
.
.
.
.
Merge branch 'master'

Conflicts:
	src/wap/public/css/controls.css
.
.
.
Merge branch 'master'

Conflicts:
	src/wap/server/model.d
.
.
.
.
.
.
Merge branch 'master'

Conflicts:
	src/wap/views/_root/renders.d
.