Fixed build errors from merge after Pod install
added additional shapes and wrote data loader to load shape data source from embedded .plist