Add mechanism for Map to JSON convertering
Merge branch 'master' of github.com:Kaile/Training

Conflicts:
	assets/dart/StatLoad.dart

Conflict solve