Angular players & tournaments
Merge branch 'master' of https://github.com/velimirg/napredna-java-2014