Merge assets
Merge branch 'master' of github.com:Wisemetrics/assets