Fixed core.jar build path issue.
Merge remote-tracking branch 'origin/development' into database