Merge branch 'hotfix/loginfix' into develop
Fix for incentive bug
Merge branch 'develop' of github.com:webhat/Working-Title into hotfix/incentiveuser
Merge branch 'hotfix/incentiveuser'