Fixes all over
Merge branch 'master' of https://github.com/pepeortiz/fiba-2013-v2