Respecting the standard layout of SVN repositories if used.

closes #418
Merge branch 'staging' into develop