Fix incorrect variable usage
Fix doc block to reference proper return description
Merge pull request #415 from x-team/issue-414

Fix broken db update routine
Merge branch 'develop' into issue-65

Conflicts:
	includes/db.php