test
Merge remote-tracking branch 'migraine/master'
updates
Conflicts:
	.gitignore
	.project
	.settings/com.appcelerator.titanium.ios.core.prefs
	.settings/com.aptana.editor.common.prefs
	CHANGELOG.txt
	LICENSE
	LICENSE.txt
	README
	Resources/KS_nav_ui.png
	Resources/KS_nav_views.png
	Resources/android/appicon.png
	Resources/android/default.png
	Resources/android/images/res-long-land-hdpi/default.png
	Resources/android/images/res-long-land-ldpi/default.png
	Resources/android/images/res-long-port-hdpi/default.png
	Resources/android/images/res-long-port-ldpi/default.png
	Resources/android/images/res-notlong-land-hdpi/default.png
	Resources/android/images/res-notlong-land-ldpi/default.png
	Resources/android/images/res-notlong-land-mdpi/default.png
	Resources/android/images/res-notlong-port-hdpi/default.png
	Resources/android/images/res-notlong-port-ldpi/default.png
	Resources/android/images/res-notlong-port-mdpi/default.png
	Resources/app.js
	Resources/calendarFunctions.js
	Resources/images/KS_nav_ui.png
	Resources/images/KS_nav_views.png
	Resources/images/back-568h@2x.png
	Resources/images/back-667h@2x.png
	Resources/images/back@3x.png
	Resources/images/clock@2x.png
	Resources/images/cloud@2x.png
	Resources/images/location@2x.png
	Resources/images/logo@2x.png
	Resources/images/next@2x.png
	Resources/images/notes@2x.png
	Resources/images/password@2x.png
	Resources/images/photo.JPG
	Resources/images/trigger@2x.png
	Resources/iphone/Default-568h@2x.png
	Resources/iphone/Default-667h@2x.png
	Resources/iphone/Default-Landscape-736h@3x.png
	Resources/iphone/Default-Landscape.png
	Resources/iphone/Default-Landscape@2x.png
	Resources/iphone/Default-Portrait-736h@3x.png
	Resources/iphone/Default-Portrait.png
	Resources/iphone/Default-Portrait@2x.png
	Resources/iphone/Default.png
	Resources/iphone/Default@2x.png
	Resources/iphone/Default@3x.png
	Resources/iphone/appicon-60@2x.png
	Resources/iphone/appicon.png
	Resources/iphone/bak/Default-568h@2x.png
	Resources/iphone/bak/Default-667h@2x.png
	Resources/styles/app.js
	Resources/ui/common/ApplicationTabGroup.js
	Resources/ui/common/overrideTabs.js
	Resources/ui/handheld/ApplicationWindow.js
	Resources/ui/handheld/add/add.js
	Resources/ui/handheld/home/alertDetails.js
	Resources/ui/handheld/home/alerts.js
	Resources/ui/handheld/home/edit.js
	Resources/ui/handheld/home/history.js
	Resources/ui/handheld/home/home.js
	Resources/ui/handheld/home/home_backup10_4_2014.js
	Resources/ui/handheld/home/medForm.js
	Resources/ui/handheld/home/medications.js
	Resources/ui/handheld/home/migraineDetails.js
	Resources/ui/handheld/home/notificationsWindow.js
	Resources/ui/handheld/home/painLocations.js
	Resources/ui/handheld/home/selectMeds.js
	Resources/ui/handheld/home/share.js
	Resources/ui/handheld/home/timePeriods.js
	Resources/ui/handheld/home/triggers.js
	Resources/ui/handheld/loadingView.js
	Resources/ui/handheld/loadingWindow.js
	Resources/ui/handheld/loginWindow.js
	Resources/ui/handheld/passwordWindow.js
	Resources/ui/handheld/registerWindow.js
	Resources/ui/handheld/settings/location.js
	Resources/ui/handheld/settings/settings.js
	Resources/ui/tablet/ApplicationWindow.js
	i18n/en/strings.xml
	i18n/ja/strings.xml
	manifest
	modules/android/analytics.google/1.0/LICENSE
	modules/android/analytics.google/1.0/documentation/index.html
	modules/android/analytics.google/1.0/example/app.js
	modules/android/analytics.google/1.0/googleAnalytics.jar
	modules/android/analytics.google/1.0/lib/libGoogleAnalyticsV2.jar
	modules/android/analytics.google/1.0/libs/armeabi-v7a/libanalytics.google.so
	modules/android/analytics.google/1.0/libs/armeabi/libanalytics.google.so
	modules/android/analytics.google/1.0/libs/x86/libanalytics.google.so
	modules/android/analytics.google/1.0/manifest
	modules/android/analytics.google/1.0/timodule.xml
	modules/iphone/analytics.google/1.0/LICENSE
	modules/iphone/analytics.google/1.0/documentation/index.html
	modules/iphone/analytics.google/1.0/example/app.js
	modules/iphone/analytics.google/1.0/libanalytics.google.a
	modules/iphone/analytics.google/1.0/manifest
	modules/iphone/analytics.google/1.0/module.xcconfig
	modules/iphone/de.marcelpociot.circularprogress/1.0/documentation/index.html
	modules/iphone/de.marcelpociot.circularprogress/1.0/libde.marcelpociot.circularprogress.a
	modules/iphone/facebook/3.1.2/LICENSE
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/Contents/Resources/en.lproj/Localizable.strings
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/Contents/Resources/he.lproj/Localizable.strings
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/facebook-logo.png
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/facebook-logo@2x.png
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadLandscape.jpg
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadLandscape@2x.jpg
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadPortrait.jpg
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/loginBackgroundIPadPortrait@2x.jpg
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/loginBackgroundIPhonePortrait.jpg
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/loginBackgroundIPhonePortrait@2x.jpg
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/silver-button-normal.png
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/silver-button-normal@2x.png
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/silver-button-pressed.png
	modules/iphone/facebook/3.1.2/assets/FBUserSettingsViewResources.bundle/images/silver-button-pressed@2x.png
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/Contents/Resources/en.lproj/Localizable.strings
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/Contents/Resources/he.lproj/Localizable.strings
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/FBDialog/images/close.png
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/FBDialog/images/close@2x.png
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/FBDialog/images/fbicon.png
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/FBLoginView/images/bluetint.png
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/FBLoginView/images/f_logo.png
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/FBLoginView/images/login-button-small-pressed.png
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/FBLoginView/images/login-button-small-pressed@2x.png
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/FBLoginView/images/login-button-small.png
	modules/iphone/facebook/3.1.2/assets/FacebookSDKResources.bundle/FBLoginView/images/login-button-small@2x.png
	modules/iphone/facebook/3.1.2/assets/images/LoginNormal.png
	modules/iphone/facebook/3.1.2/assets/images/LoginNormal@2x.png
	modules/iphone/facebook/3.1.2/assets/images/LoginPressed.png
	modules/iphone/facebook/3.1.2/assets/images/LoginPressed@2x.png
	modules/iphone/facebook/3.1.2/assets/images/LoginWithFacebookNormal.png
	modules/iphone/facebook/3.1.2/assets/images/LoginWithFacebookNormal@2x.png
	modules/iphone/facebook/3.1.2/assets/images/LoginWithFacebookPressed.png
	modules/iphone/facebook/3.1.2/assets/images/LoginWithFacebookPressed@2x.png
	modules/iphone/facebook/3.1.2/assets/images/LogoutNormal.png
	modules/iphone/facebook/3.1.2/assets/images/LogoutNormal@2x.png
	modules/iphone/facebook/3.1.2/assets/images/LogoutPressed.png
	modules/iphone/facebook/3.1.2/assets/images/LogoutPressed@2x.png
	modules/iphone/facebook/3.1.2/documentation/ATTRIBUTION.html
	modules/iphone/facebook/3.1.2/documentation/changelog.html
	modules/iphone/facebook/3.1.2/documentation/index.html
	modules/iphone/facebook/3.1.2/example/app.js
	modules/iphone/facebook/3.1.2/example/loginwindow.js
	modules/iphone/facebook/3.1.2/example/publishstream.js
	modules/iphone/facebook/3.1.2/example/readstream.js
	modules/iphone/facebook/3.1.2/libfacebook.a
	modules/iphone/facebook/3.1.2/manifest
	modules/iphone/facebook/3.1.2/module.xcconfig
	tiapp.xml