Updated with database information.
Merge remote-tracking branch 'origin/master'

* origin/master:
  remove old directory.
  asset manager
  asset manager