Made popup have variable number of outcomes

May have also fixed some weird bugs
Merge branch 'master' of https://github.com/Maplenormandy/mitsim2014

Conflicts:
	source/PlayState.hx