1
Merge branch 'master' of https://github.com/openjavascript/fchart

Conflicts:
	flash/pub/charts/Map.swf
1