update UI changes

Signed-off-by: Gebre Wallace <gebre@artuvic.com>
modified charts to fix errors
Merge branch 'master' of https://github.com/CaribbeanOpenInstitute/Area

Conflicts:
	res/drawable/rounded_border.xml
	src/jm/org/data/area/AreaExpandableListAdapter.java