adding Blinding , Screed and backfinlling Form
adding Blinding , Screed and backfinlling Form --removing conflicting files
remove conflicting files
Merge branch 'master' of https://github.com/redatest/adrr

Conflicts:
	src/app/wrapper/wrapper.tpl.html
Merge branch 'master' of https://github.com/redatest/adrr

Conflicts:
	src/app/wrapper/wrapper.tpl.html
update bsb