Fixed API problem
Merge branch 'master' of ssh://github.com/garrettvparrish/Lucerne-ios

Fixed managed object model error.

Conflicts:
	LucerneSymphony/.DS_Store
	LucerneSymphony/Classes/LSNavControllerButtonBarItem.m
	LucerneSymphony/Höre Luzern.xcodeproj/project.xcworkspace/xcuserdata/garrett.xcuserdatad/UserInterfaceState.xcuserstate