temp commit
temp commit
Merge branch 'feature-W9B-2' into fixbug
Fix group database error.
Fix boolean value switch error
Merge branch 'fixbug' into develop

Conflicts:
	initial_data.json