some fixes to ids and making more angular
Merge branch 'master' of https://www.github.com/theloons/sportim-web