Merge pull request #8 from llh1/master

Use lims-core and lims-api master branches