merged files
Revert "merged files"

This reverts commit 0b1d248bfff63e01450acb250baf6e36b7c1ff60.
Merge branch 'master' of ssh://git@github.com/ovido/BPView.git