Merge branch 'hotfix/xp-badges' into develop
Merge branch 'hotfix/travis-badge' into develop
user model via tdd and user registration
Merge branch 'release/user_registration'