Add icons to children
Merge branch 'master' of https://github.com/madisonmay/LinkEd_Android

Conflicts:
	App/LinkEd/LinkEd/src/main/res/layout/listrow_details.xml
	App/LinkEd/LinkEd/src/main/res/layout/listrow_group.xml
	out/production/main/LinkEd/linked/R$drawable.class
	out/production/main/LinkEd/linked/R$id.class
	out/production/main/LinkEd/linked/R$layout.class
	out/production/main/LinkEd/linked/R$menu.class
	out/production/main/LinkEd/linked/R$string.class
	out/production/main/LinkEd/linked/R$style.class
	out/production/main/LinkEd/linked/R.class
	out/production/main/com/zhomans/linked/MainActivity$3.class
	out/production/main/com/zhomans/linked/MainActivity$7.class
	out/production/main/com/zhomans/linked/MainActivity$8.class
	out/production/main/com/zhomans/linked/MainActivity$9.class
	out/production/main/com/zhomans/linked/MainActivity.class
	out/production/main/com/zhomans/linked/MyExpandableListAdapter.class
	out/production/main/main.apk
	out/production/main/main.unaligned.apk