Merge branch 'master' of github.com:aomra015/vvapp