Updated link to point to GitHub wiki
Whoopsy, reverted some test code
Merge pull request #61 from garethm/patch-1

Updated link to point to GitHub wiki
Fixed bug in intelligent merging code, added large test case
Merge branch 'master' of https://github.com/opensourceBIM/BIMserver.git
- Fixed bug where IfcGeometricRepresentationContext seemed to have
derived attributes, where it shouldn't
Added gitdir image
- Loading plugins recursively
- Fixed another bug in derived attributes
Improved loading plugins
Added ability to add remote smtp(s) server
Removed ivy files, no point in keeping these around when nobody updates
them
changed gitdir to plugings and made it "many"
Merge remote-tracking branch 'realorigin/master'

Conflicts:
	BimServer/src/org/bimserver/database/actions/AddUserDatabaseAction.java