updated the model file, configured the app with icons and stuff (still need to configure for release and for adhoc, other minor updates.
merged with master, resloved conflicts