1232131
Merge branch 'dev'
kjk
fdsf
submit me
fsf
font-size
fdsfds
Merge branch 'dev'

Conflicts:
	hybridapp/platforms/android/CordovaLib/ant-build/build.prop
	hybridapp/platforms/android/ant-build/CarService-debug-unaligned.apk
	hybridapp/platforms/android/ant-build/CarService-debug.apk
	hybridapp/platforms/android/ant-build/CarService.ap_
	hybridapp/platforms/android/ant-build/CarService.ap_.d
	hybridapp/platforms/android/ant-build/build.prop
	hybridapp/platforms/android/assets/www/css/app.css
	hybridapp/platforms/android/assets/www/css/reset.css
	hybridapp/platforms/android/assets/www/index.html
	hybridapp/platforms/android/assets/www/js/UI.js
	hybridapp/platforms/android/assets/www/js/controller.js
	hybridapp/platforms/android/assets/www/js/iscroll.js
polish
fdsfsd f
123123
Merge branch 'dev'

Conflicts:
	hybridapp/platforms/android/CordovaLib/ant-build/AndroidManifest.xml.d
	hybridapp/platforms/android/CordovaLib/ant-build/build.prop
	hybridapp/platforms/android/CordovaLib/ant-build/classes.jar
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Address.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Connection.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/ConnectionPool$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/ConnectionPool$2.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/ConnectionPool.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Dispatcher.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Failure$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Failure$Builder.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Failure.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/HttpResponseCache$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/HttpResponseCache$2.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/HttpResponseCache$3.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/HttpResponseCache$CacheRequestImpl$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/HttpResponseCache$CacheRequestImpl.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/HttpResponseCache$Entry.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/HttpResponseCache.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Job.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/MediaType.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/OkAuthenticator$Challenge.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/OkHttpClient$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/OkHttpClient.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Request$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Request$Body$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Request$Body$2.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Request$Body.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Request$Builder.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Request.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Response$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Response$Body.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Response$Builder.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Response.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/ResponseSource.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/Route.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/DiskLruCache$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/DiskLruCache$2.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/DiskLruCache$Editor$FaultHidingOutputStream.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/DiskLruCache$Editor.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/DiskLruCache$Entry.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/DiskLruCache$Snapshot.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/DiskLruCache.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/Dns$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/Dns.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/NamedRunnable.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/Platform$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/Platform$Android23.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/Platform$Android41.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/Platform$JdkWithJettyNpnPlatform.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/Platform$JettyNpnProvider.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/Platform.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/StrictLineReader$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/StrictLineReader.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/Util$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/Util.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HeaderParser.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpAuthenticator$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpAuthenticator.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpDate$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpDate.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpEngine$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpEngine.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpTransport$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpTransport$ChunkedInputStream.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpTransport$ChunkedOutputStream.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpTransport$FixedLengthOutputStream.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpTransport.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpURLConnectionImpl$Retry.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpsEngine.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl$HttpUrlConnectionDelegate.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/HttpsURLConnectionImpl.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/RawHeaders$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/RawHeaders.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/RequestHeaders$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/RequestHeaders.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/ResponseHeaders$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/ResponseHeaders.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/RetryableOutputStream.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/RouteSelector.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/http/SpdyTransport.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/ErrorCode.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/HeadersMode.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$Reader.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Hpack$Writer.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Http20Draft06$Reader.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Http20Draft06$Writer.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/IncomingStreamHandler$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/IncomingStreamHandler.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader$2.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/NameValueBlockReader.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Settings.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Spdy3$Reader.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Spdy3$Writer.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/Spdy3.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/SpdyConnection$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/SpdyConnection$2.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/SpdyConnection$3.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/SpdyConnection$Reader$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/SpdyConnection$Reader.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/SpdyConnection.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/SpdyStream$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/SpdyStream$SpdyDataInputStream.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/SpdyStream$SpdyDataOutputStream.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/spdy/SpdyStream.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/tls/DistinguishedNameParser.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/com/squareup/okhttp/internal/tls/OkHostnameVerifier.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/App$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/App$2.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/App$3.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/App$4.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/App.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CallbackContext.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Config.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaActivity$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaActivity$2.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaActivity$3.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaActivity$4$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaActivity$4.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaActivity$5$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaActivity$5.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaActivity.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaArgs.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$2.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$3.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$4.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$5.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$6.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$7.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$8.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient$9.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaChromeClient.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaPlugin.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaResourceApi.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$2.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$3.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$4.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView$ActivityResult.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebView.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient$1$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/CordovaWebViewClient.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/DirectoryManager.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/ExposedJsApi.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/FileHelper.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/IceCreamCordovaWebViewClient.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/LOG.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/LinearLayoutSoftKeyboardDetect.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$BridgeMode.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$JsMessage.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$LoadUrlBridgeMode.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$OnlineEventsBridgeMode.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue$PrivateApiBridgeMode.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/NativeToJsMessageQueue.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginEntry.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$PluginManagerService$1.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager$PluginManagerService.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginManager.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginResult$Status.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/PluginResult.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Whitelist$URLPattern.class
	hybridapp/platforms/android/CordovaLib/ant-build/classes/org/apache/cordova/Whitelist.class
	hybridapp/platforms/android/CordovaLib/ant-gen/R.java.d
	hybridapp/platforms/android/CordovaLib/local.properties
	hybridapp/platforms/android/ant-build/AndroidManifest.xml.d
	hybridapp/platforms/android/ant-build/CarService-debug-unaligned.apk
	hybridapp/platforms/android/ant-build/CarService-debug-unaligned.apk.d
	hybridapp/platforms/android/ant-build/CarService-debug.apk
	hybridapp/platforms/android/ant-build/CarService.ap_
	hybridapp/platforms/android/ant-build/CarService.ap_.d
	hybridapp/platforms/android/ant-build/build.prop
	hybridapp/platforms/android/ant-build/classes.dex
	hybridapp/platforms/android/ant-build/classes.dex.d
	hybridapp/platforms/android/ant-gen/R.java.d
	hybridapp/platforms/android/assets/www/css/app.css
	hybridapp/platforms/android/assets/www/css/reset.css
	hybridapp/platforms/android/assets/www/index.html
	hybridapp/platforms/android/assets/www/js/UI.js
	hybridapp/platforms/android/assets/www/js/controller.js
	hybridapp/platforms/android/local.properties
	hybridapp/platforms/android/res/xml/config.xml
	hybridapp/www/js/controller.js