reshufled the api code and added test data
resolved merge conflict
Merge branch 'core_api_team' of https://github.com/puffball/puffball into core_api_team

Conflicts:
	core/CoreApi.js