6
Merge branch 'master' of https://github.com/wailorman/dance-cdc

Conflicts:
	.idea/workspace.xml
	core/api.class.php
	core/manageMembers.class.php
	core/manageTournament.class.php
	core/test.php
	reception/index.html
	reception/upperTDmoving.js