adding basic model objects
updates to go with new model objects
Trying like mad to merge
Merge branch 'master' of https://github.com/headhippo/wob-prototype-moai

Conflicts:
	game.lua
	input_manager.lua
	main_menu.lua