updating for github stupid limit
minor updates
Merge branch 'master' of https://github.com/dioptre/eodb

Conflicts:
	src/main/XODB.Orchard/src/Orchard.Web/Modules/XODB.TeamInsight
merging stage