move from view to viewModel
Merge branch 'master' of https://github.com/Eygle/wmp
Merge branch 'master' of https://github.com/Eygle/wmp