club i akademija na pola

club and academy
Merge branch 'master' of https://github.com/svemirko/pkf

Conflicts:
	app/views/data.php