stash
Merge branch 'master' of https://github.com/husaini/tems
Merge branch 'master' of https://github.com/husaini/tems
Merge branch 'master' of https://github.com/husaini/tems
Merge pull request #4 from jibone/master

Bug fix for asset update
Merge branch 'master' of https://github.com/husaini/tems
asset list: blank location name
fix bug when insert new asset ppm freq not saved