Fix DB
Merge branch 'develop' of https://github.com/electricalwind/NameNotFound into develop

Conflicts:
	application/database/installdb.sql