Onsen ui 1.1.0 templates
modified project_info.json
Merge branch 'master' into dev_3.5

Conflicts:
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/icons/Icon-72@2x.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-568h@2x.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-568h@2x~iphone.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape-768h.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape-768h@2x.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape@2x~ipad.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape~ipad.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait-1024h.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait-1024h@2x.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait@2x~ipad.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait~ipad.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default@2x.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default@2x~iphone.png
	10-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default~iphone.png
	11-ons-split/.monaca/project_info.json
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default-568h@2x.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default-568h@2x~iphone.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default-Landscape-768h.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default-Landscape-768h@2x.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default-Landscape@2x~ipad.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default-Landscape~ipad.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default-Portrait-1024h.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default-Portrait-1024h@2x.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default-Portrait@2x~ipad.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default-Portrait~ipad.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default@2x.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default@2x~iphone.png
	11-ons-split/platforms/ios/MonacaApp/Resources/splash/Default~iphone.png
	12-ons-split-nav/.monaca/project_info.json
	12-ons-split-nav/config.android.xml
	12-ons-split-nav/platforms/ios/MonacaApp-Info.plist
	12-ons-split-nav/platforms/ios/MonacaApp/Resources/splash/Default-568h@2x~iphone.png
	12-ons-split-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape@2x~ipad.png
	12-ons-split-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape~ipad.png
	12-ons-split-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait@2x~ipad.png
	12-ons-split-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait~ipad.png
	12-ons-split-nav/platforms/ios/MonacaApp/Resources/splash/Default@2x~iphone.png
	12-ons-split-nav/platforms/ios/MonacaApp/Resources/splash/Default~iphone.png
	13-ons-master-detail/.monaca/project_info.json
	13-ons-master-detail/config.android.xml
	13-ons-master-detail/platforms/ios/MonacaApp-Info.plist
	13-ons-master-detail/platforms/ios/MonacaApp/Resources/splash/Default-568h@2x~iphone.png
	13-ons-master-detail/platforms/ios/MonacaApp/Resources/splash/Default-Landscape@2x~ipad.png
	13-ons-master-detail/platforms/ios/MonacaApp/Resources/splash/Default-Landscape~ipad.png
	13-ons-master-detail/platforms/ios/MonacaApp/Resources/splash/Default-Portrait@2x~ipad.png
	13-ons-master-detail/platforms/ios/MonacaApp/Resources/splash/Default-Portrait~ipad.png
	13-ons-master-detail/platforms/ios/MonacaApp/Resources/splash/Default@2x~iphone.png
	13-ons-master-detail/platforms/ios/MonacaApp/Resources/splash/Default~iphone.png
	8-ons-sliding-menu-nav/.monaca/project_info.json
	8-ons-sliding-menu-nav/platforms/android/splash_default.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/icons/Icon-60@2x.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/icons/Icon-72.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/icons/Icon-72@2x.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/icons/Icon-76.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/icons/Icon-76@2x.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/icons/Icon.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/icons/Icon@2x.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-568h@2x.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape-768h.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape-768h@2x.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape@2x.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait-1024h.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait-1024h@2x.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait@2x.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default.png
	8-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default@2x.png
	8-ons-sliding-menu/.monaca/project_info.json
	8-ons-sliding-menu/config.android.xml
	8-ons-sliding-menu/platforms/ios/MonacaApp-Info.plist
	8-ons-sliding-menu/platforms/ios/MonacaApp/Resources/splash/Default-568h@2x~iphone.png
	8-ons-sliding-menu/platforms/ios/MonacaApp/Resources/splash/Default-Landscape@2x~ipad.png
	8-ons-sliding-menu/platforms/ios/MonacaApp/Resources/splash/Default-Landscape~ipad.png
	8-ons-sliding-menu/platforms/ios/MonacaApp/Resources/splash/Default-Portrait@2x~ipad.png
	8-ons-sliding-menu/platforms/ios/MonacaApp/Resources/splash/Default@2x~iphone.png
	8-ons-sliding-menu/platforms/ios/MonacaApp/Resources/splash/Default~iphone.png
	9-ons-sliding-menu-nav/config.android.xml
	9-ons-sliding-menu-nav/platforms/ios/MonacaApp-Info.plist
	9-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-568h@2x~iphone.png
	9-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape@2x~ipad.png
	9-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape~ipad.png
	9-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait@2x~ipad.png
	9-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait~ipad.png
	9-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default@2x~iphone.png
	9-ons-sliding-menu-nav/platforms/ios/MonacaApp/Resources/splash/Default~iphone.png
	9-ons-tab-nav/.monaca/project_info.json
	9-ons-tab-nav/platforms/android/splash_default.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/icons/Icon-60@2x.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/icons/Icon-72.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/icons/Icon-72@2x.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/icons/Icon-76.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/icons/Icon-76@2x.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/icons/Icon.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/icons/Icon@2x.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-568h@2x.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape-768h.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape-768h@2x.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Landscape@2x.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait-1024h.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait-1024h@2x.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default-Portrait@2x.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default.png
	9-ons-tab-nav/platforms/ios/MonacaApp/Resources/splash/Default@2x.png
	98-mbaas/platforms/android/res/drawable-xxhdpi/icon.png
	98-mbaas/platforms/ios/MonacaApp/Resources/splash/Default-Portrait~ipad.png