Updated TODO
Merge branch 'develop' of github.com:clubmaster/clubmaster into develop
Admin can see users bookings

Conflicts:
	CHANGELOG