Removed choice capability for some fields and reworked "credits"... again
Merge branch 'master' of github.com:Vladimiroff/massive-octo-ninja

Conflicts:
	mon/mon/fixtures/data.json