GIT FIX (?)
Merge branch 'dev' of https://github.com/sramirezayuso/Fifajalla into dev

Conflicts:
	config/routes.rb
NEW LEAGUE FUNCTIONALITY