Refactored code and added some functionality.
Merge branch 'develop' of https://github.com/intesys/asset_manager into develop