Finalize asset service and merge refactoring.
Merge pull request #76 from dejan-brkic/master

Finalize asset service and merge refactoring.