asdf
Merge branch 'newdesign' of http://redmine.wi1projects.com/dlr into newdesign