Merge pull request #1 from wwojcik/develop

add travis and gemnasium
Fix branch in travis config
Merge branch 'master' into feature/club
Merge remote-tracking branch 'origin/master' into feature/club