Merge pull request #1 from jborgeest/dev-jason

Dev jason
Model for database content lookup
merged with master from jason
Merge branch 'master' into dev-jason

Conflicts:
	html/index.php