AssetsController (10%)
Merge branch 'master' of github.com:mariowise/am
AssetController(40%) - agregar
AssetController(45%) - agregar