added entity templates
extended models
added some stub data
fixed data parsing
Merge branch 'master' into data-models

Conflicts resolved:
	Caveman/Caveman.xcodeproj/project.pbxproj
	Caveman/Caveman/AppDelegate.m