Done with project 3
Done
Merge branch 'master' of github.com:nedwards42/ASD1410

Conflicts:
	.project
	.settings/com.aptana.editor.common.prefs
	Resources/app.js
	Resources/tableviewanddetail.js
	build/iphone/Classes/AFOpenFlow/AFUIImageReflection.h
	build/iphone/Classes/AFOpenFlow/AFUIImageReflection.m
	build/iphone/Classes/APSAnalytics/APSAnalytics.h
	build/iphone/Classes/APSHTTPClient/APSHTTPClient.h
	build/iphone/Classes/APSHTTPClient/APSHTTPHelper.h
	build/iphone/Classes/APSHTTPClient/APSHTTPPostForm.h
	build/iphone/Classes/APSHTTPClient/APSHTTPRequest.h
	build/iphone/Classes/APSHTTPClient/APSHTTPResponse.h
	build/iphone/Classes/AudioStreamer/AudioStreamer.h
	build/iphone/Classes/ImageLoader.h
	build/iphone/Classes/ImageLoader.m
	build/iphone/Classes/KrollBridge.h
	build/iphone/Classes/KrollBridge.m
	build/iphone/Classes/KrollContext.m
	build/iphone/Classes/KrollMethod.m
	build/iphone/Classes/KrollObject.m
	build/iphone/Classes/LauncherButton.h
	build/iphone/Classes/LauncherButton.m
	build/iphone/Classes/LauncherItem.h
	build/iphone/Classes/LauncherItem.m
	build/iphone/Classes/LauncherView.h
	build/iphone/Classes/LauncherView.m
	build/iphone/Classes/ThirdpartyNS.h
	build/iphone/Classes/TiApp.m
	build/iphone/Classes/TiBase.h
	build/iphone/Classes/TiBindingRunLoop.h
	build/iphone/Classes/TiButtonUtil.m
	build/iphone/Classes/TiControllerProtocols.h
	build/iphone/Classes/TiModule.h
	build/iphone/Classes/TiModule.m
	build/iphone/Classes/TiProxy.h
	build/iphone/Classes/TiProxy.m
	build/iphone/Classes/TiRootViewController.h
	build/iphone/Classes/TiUIButtonProxy.m
	build/iphone/Classes/TiUIImageView.m
	build/iphone/Classes/TiUIScrollableView.h
	build/iphone/Classes/TiUISearchBarProxy.h
	build/iphone/Classes/TiUITextWidget.h
	build/iphone/Classes/TiUITextWidget.m
	build/iphone/Classes/TiUITextWidgetProxy.m
	build/iphone/Classes/TiUIView.h
	build/iphone/Classes/TiUIView.m
	build/iphone/Classes/TiUIWebView.m
	build/iphone/Classes/TiUIiOSDocumentViewerProxy.m
	build/iphone/Classes/TiUIiPhoneSystemButtonProxy.m
	build/iphone/Classes/TiUtils.h
	build/iphone/Classes/TiUtils.m
	build/iphone/Classes/TiViewProxy.h
	build/iphone/Classes/UIImage+Alpha.h
	build/iphone/Classes/UIImage+Resize.h
	build/iphone/Classes/UIImage+RoundedCorner.h
	build/iphone/Classes/defines.h
	build/iphone/Info.plist
	build/iphone/build-manifest.json
	build/iphone/main.m
	manifest
	tiapp.xml