Adding resource management
Merge branch 'master' of https://github.com/Iverance/MAC_CLOUD