Merge pull request #57 from bitblueprint/RotatingAssets-feature

Rotating assets feature
Merge pull request #58 from bitblueprint/ExtendingMetadataFromMasterAsset-feature

Extending metadata from master asset feature
Fixing indention.
Making promises return promises, and rearranging calls.
Fixing indention and cleanup code that was applied twice in seperate branches.