Fixed a bug which sometimes made siteBuilder pick the wrong entry to be the default entry
Merge branch 'Dev' into Stable
does no longer shit itself when the database is empty