merge
fetch from upstream
Merge pull request #6 from samzhao88/develop

clean up controller.java, separate out DB_PATH in to Constant object.