Fixed bug in intelligent merging code, added large test case
Merge branch 'master' of https://github.com/opensourceBIM/BIMserver.git