Make proper complex objects and ability to add components, wax UIStack, and add dynamic choices to menu.
Merge branch 'c_rewrite' of https://github.com/datalurkur/Bushido-Mongers into c_rewrite

Conflicts:
	Makefile