Merge achartengine from Master