.
Merge branch 'master'

Conflicts:
	src/wap/server/webrender.d
.
Merge branch '#50-ListView'
.
.
.
.
.
Merge branch 'origin/#3-DataGrid'