dfiog
Merge branch 'master' of https://github.com/james-d-may/teamnova
jerw

Conflicts:
	database-queries.php