Working design for meeting

This is a device tested design.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.sencha/app/build.properties
	.sencha/app/native.properties
	app.js
	app.json
	bootstrap.js
	bootstrap.json
	build.xml
	index.html

Merging upstream/master to resolve divergent branches.
Create Stores and Models to handle json data

I created specific stores and models, so that we could correctly display
our json data.
Add detail page and access json data updates

I linked the detail page and updated it for the new app layout. Also
included are the stores and models that help us grab and use our json
data.
Add controls to display data in context

I added controls to render data from our json refrencing stores in the
correct views.
Add list filtering

Working on adding filters to my lists.
Add new filter techniques

Added multiple ways to implement list filtering
Add functionality to the filter function

Made the filter function work between the homepage and listpage
Add navigation flow

Added list navigation flow between home and list screens as well as list
and detail screens.
Merge branch 'filter'
Testing pusing to device 8/25

Fixed home page to just show header so we could see if the device is
getting a new app loaded.
Merge remote-tracking branch 'upstream/master'

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

This is a device tested design.
Create Stores and Models to handle json data

I created specific stores and models, so that we could correctly display
our json data.
Add detail page and access json data updates

I linked the detail page and updated it for the new app layout. Also
included are the stores and models that help us grab and use our json
data.
Add list filtering

Working on adding filters to my lists.
Add framework for homepage vendor number

Added tpl panel to print out the data from the controller. We haven't yet
found out howto send data found in controller to the view correctly.
Add distance from user drop down

Added a drop down table for users to choose how far away from themselves
they want to look for vendors.
Test why app is not updating

This is to make sure I have the head of my project in case that is the
reason the app is not updating on the device.
Fix build.xml merge conflicts

Fixed the build.xmlby removing merge conflict git commit.