assets refactored
Merge branch 'master' of github.com:mcasimir/fullstack-admin
assets refactored