api url adapted
Merge branch 'develop' of https://github.com/tobikris/club into develop

Conflicts:
	public/js/charts.js