added correct document types to the .plist file
working on Core Data settings
Merge remote-tracking branch 'github/master'
Merge remote-tracking branch 'github/master'
leftovers