Icons for children are now assigned on a child basis
Merge branch 'master' of https://github.com/madisonmay/LinkEd_Android

Conflicts:
	out/production/main/main.apk
	out/production/main/main.unaligned.apk