resolved the database retrieval problem and some UI problem
Merge branch 'testing' of https://github.com/iips-dc/pbas into testing