v2.5
Merge branch 'master' of https://github.com/alvar21/clubs_2232

Conflicts:
	data.sql