public/ -> app
installed my own assetmanager
changed references from public/ -> app/
Merge branch 'assetmanager' into folder_move

* assetmanager:
  installed my own assetmanager