Merge branch 'hotfix/paymentupdate'
Merge branch 'release/v1.15'
Merge branch 'hotfix/paymentupdate'
Merge branch 'master' of github.com:webhat/Working-Title
Merge branch 'develop' of github.com:webhat/Working-Title into hotfix/fanvid
Added you are a Fan Video
Merge branch 'master' of github.com:webhat/Working-Title into hotfix/fanvid
Merge branch 'hotfix/fanvid' into develop