Merge branch 'master' of https://github.com/marlonramon/bolao

Conflicts:
	bolao-parent/bolao-angular/app/index.html
	bolao-parent/bolao-angular/app/js/app.js