User-database instance mapping moved from under user to under database version, this way objects under 'security' don't reference anything under 'layout'.
Command-line tool and web admin are updated accordingly.
Merge branch 'master' of https://github.com/dobos/graywulf

Conflicts:
	dll/Jhu.Graywulf.Registry/Registry/EntityFactory.cs