Some very basic initial setup.

Basic core data model setup.
Merge remote-tracking branch 'origin/master'