Change the column order to a more logical sequence
Use the api version of DB_query to avoid html being returned
Merge pull request #481 from fahadhatib/develop

Develop
Merge branch 'develop' of https://github.com/KwaMoja/KwaMoja into develop
Merge pull request #482 from timschofield/develop

Develop