Updated code with assets management
Merge branch 'master' of https://github.com/niranjfantain/fantainbuild