Merge branch 'develop1.1' of https://bitbucket.org/roxwin/android-ezitreat

Conflicts:
	Android-PullToRefresh-master/.gitignore
	Android-PullToRefresh-master/LICENSE
	Android-PullToRefresh-master/README.md
	Android-PullToRefresh-master/extras/PullToRefreshListFragment/AndroidManifest.xml
	Android-PullToRefresh-master/extras/PullToRefreshListFragment/LICENSE
	Android-PullToRefresh-master/extras/PullToRefreshListFragment/pom.xml
	Android-PullToRefresh-master/extras/PullToRefreshListFragment/res/layout/need_this_for_maven.xml
	Android-PullToRefresh-master/extras/PullToRefreshListFragment/src/com/handmark/pulltorefresh/extras/listfragment/PullToRefreshBaseListFragment.java
	Android-PullToRefresh-master/extras/PullToRefreshListFragment/src/com/handmark/pulltorefresh/extras/listfragment/PullToRefreshExpandableListFragment.java
	Android-PullToRefresh-master/extras/PullToRefreshListFragment/src/com/handmark/pulltorefresh/extras/listfragment/PullToRefreshListFragment.java
	Android-PullToRefresh-master/extras/PullToRefreshViewPager/AndroidManifest.xml
	Android-PullToRefresh-master/extras/PullToRefreshViewPager/ant.properties
	Android-PullToRefresh-master/extras/PullToRefreshViewPager/pom.xml
	Android-PullToRefresh-master/extras/PullToRefreshViewPager/proguard-project.txt
	Android-PullToRefresh-master/extras/PullToRefreshViewPager/res/layout/need_this_for_maven.xml
	Android-PullToRefresh-master/extras/PullToRefreshViewPager/res/values/ids.xml
	Android-PullToRefresh-master/extras/PullToRefreshViewPager/src/com/handmark/pulltorefresh/extras/viewpager/PullToRefreshViewPager.java
	Android-PullToRefresh-master/extras/pom.xml
	Android-PullToRefresh-master/library/AndroidManifest.xml
	Android-PullToRefresh-master/library/LICENSE
	Android-PullToRefresh-master/library/pom.xml
	Android-PullToRefresh-master/library/res/anim/slide_in_from_bottom.xml
	Android-PullToRefresh-master/library/res/anim/slide_in_from_top.xml
	Android-PullToRefresh-master/library/res/anim/slide_out_to_bottom.xml
	Android-PullToRefresh-master/library/res/anim/slide_out_to_top.xml
	Android-PullToRefresh-master/library/res/drawable/indicator_bg_bottom.xml
	Android-PullToRefresh-master/library/res/drawable/indicator_bg_top.xml
	Android-PullToRefresh-master/library/res/layout/pull_to_refresh_header_horizontal.xml
	Android-PullToRefresh-master/library/res/values-ar/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-cs/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-de/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-es/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-fi/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-fr/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-he/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-it/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-iw/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-ja/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-ko/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-nl/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-pl/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-pt-rBR/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-pt/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-ro/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-ru/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values-zh/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/res/values/attrs.xml
	Android-PullToRefresh-master/library/res/values/dimens.xml
	Android-PullToRefresh-master/library/res/values/ids.xml
	Android-PullToRefresh-master/library/res/values/pull_refresh_strings.xml
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/ILoadingLayout.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/IPullToRefresh.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/LoadingLayoutProxy.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/OverscrollHelper.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/PullToRefreshAdapterViewBase.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/PullToRefreshBase.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/PullToRefreshExpandableListView.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/PullToRefreshGridView.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/PullToRefreshHorizontalScrollView.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/PullToRefreshListView.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/PullToRefreshScrollView.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/PullToRefreshWebView.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/extras/PullToRefreshWebView2.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/extras/SoundPullEventListener.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/internal/EmptyViewMethodAccessor.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/internal/FlipLoadingLayout.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/internal/IndicatorLayout.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/internal/LoadingLayout.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/internal/RotateLoadingLayout.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/internal/Utils.java
	Android-PullToRefresh-master/library/src/com/handmark/pulltorefresh/library/internal/ViewCompat.java
	Android-PullToRefresh-master/pom.xml
	Android-PullToRefresh-master/sample/AndroidManifest.xml
	Android-PullToRefresh-master/sample/LICENSE
	Android-PullToRefresh-master/sample/pom.xml
	Android-PullToRefresh-master/sample/res/layout/activity_ptr_expandable_list.xml
	Android-PullToRefresh-master/sample/res/layout/activity_ptr_grid.xml
	Android-PullToRefresh-master/sample/res/layout/activity_ptr_horizontalscrollview.xml
	Android-PullToRefresh-master/sample/res/layout/activity_ptr_list.xml
	Android-PullToRefresh-master/sample/res/layout/activity_ptr_list_fragment.xml
	Android-PullToRefresh-master/sample/res/layout/activity_ptr_list_in_vp.xml
	Android-PullToRefresh-master/sample/res/layout/activity_ptr_scrollview.xml
	Android-PullToRefresh-master/sample/res/layout/activity_ptr_viewpager.xml
	Android-PullToRefresh-master/sample/res/layout/activity_ptr_webview.xml
	Android-PullToRefresh-master/sample/res/layout/activity_ptr_webview2.xml
	Android-PullToRefresh-master/sample/res/layout/layout_listview_in_viewpager.xml
	Android-PullToRefresh-master/sample/res/values/strings.xml
	Android-PullToRefresh-master/sample/res/values/styles.xml
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/LauncherActivity.java
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/PullToRefreshExpandableListActivity.java
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/PullToRefreshGridActivity.java
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/PullToRefreshHorizontalScrollViewActivity.java
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/PullToRefreshListActivity.java
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/PullToRefreshListFragmentActivity.java
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/PullToRefreshListInViewPagerActivity.java
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/PullToRefreshScrollViewActivity.java
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/PullToRefreshViewPagerActivity.java
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/PullToRefreshWebView2Activity.java
	Android-PullToRefresh-master/sample/src/com/handmark/pulltorefresh/samples/PullToRefreshWebViewActivity.java
	MyHelper/bin/classes/com/devmaster/myhelper/activities/MainActivity$1$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/MainActivity$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/MainActivity$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/MainActivity$3.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/base/BaseActionbarActivity$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/base/BaseActionbarActivity$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/base/BaseActionbarActivity$3.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/base/BaseActionbarActivity$4.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/base/BaseActionbarActivity$5$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/base/BaseActionbarActivity$5.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/base/BaseActionbarActivity$6.class
	MyHelper/bin/classes/com/devmaster/myhelper/activities/base/BaseActionbarActivity$7.class
	MyHelper/bin/classes/com/devmaster/myhelper/adapters/CurrentEventAdapter$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/adapters/CurrentEventAdapter$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/adapters/HowfrequentlyAdapter$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/adapters/PlaceAdapter$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/adapters/TodayEventAdapter$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/adapters/TodayEventAdapter$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/adapters/TreatMentUseAdapter$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/adapters/TreatmentAdapter$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/adapters/TreatmentAdapter$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$10.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$11.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$3.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$4.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$5.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$6.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$7.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$8.class
	MyHelper/bin/classes/com/devmaster/myhelper/api/callservice/CallService$9.class
	MyHelper/bin/classes/com/devmaster/myhelper/dialogs/MyOptionDialog$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/dialogs/MyOptionDialog$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/dialogs/MyOptionDialog$3.class
	MyHelper/bin/classes/com/devmaster/myhelper/dialogs/MyProgressDialogFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/CurrentEventFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/CurrentEventFragment$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/HistoricEventFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/HistoricEventFragment$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/HowfrequentlyFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/HowfrequentlyFragment$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/LoginFragment$1$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/LoginFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/LoginFragment$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/MainScreenFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/MainScreenFragment$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/NewEventFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/NewEventFragment$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/NewEventFragment.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/PersonalInformationsFragment$1$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/PersonalInformationsFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/PersonalInformationsFragment.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/RegisterFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/RegisterTreatmentFragment.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/SettingFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/StartScreenFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/StartScreenFragment$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/StartScreenFragment$3.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/TreatmentUseFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/TreatmentUseFragment.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/ViewSavedTreatmentFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/ViewSavedTreatmentFragment$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/fragment/base/BaseFragment$1.class
	MyHelper/bin/classes/com/devmaster/myhelper/gui/listview/HorizontalListView$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/social/facebook/FacebookUtil$2.class
	MyHelper/bin/classes/com/devmaster/myhelper/social/facebook/FacebookUtil$7.class
	MyHelper/res/layout/activity_input_treatmentname.xml
	MyHelper/res/layout/activity_input_wh_meat.xml
	MyHelper/res/layout/activity_input_wh_milk.xml
	MyHelper/res/layout/activity_new_event.xml
	MyHelper/res/layout/activity_new_treatment.xml
	MyHelper/res/layout/dialog_option.xml
	MyHelper/res/layout/dialog_select_date_time.xml
	MyHelper/res/layout/fragment_change_password.xml
	MyHelper/res/values/colors.xml
	MyHelper/src/com/devmaster/myhelper/activities/InputFrequencyActivity.java
	MyHelper/src/com/devmaster/myhelper/activities/InputWhMeatActivity.java
	MyHelper/src/com/devmaster/myhelper/activities/InputWhMilkActivity.java
	MyHelper/src/com/devmaster/myhelper/activities/InputWhtypeActivity.java
	MyHelper/src/com/devmaster/myhelper/activities/MainActivity.java
	MyHelper/src/com/devmaster/myhelper/activities/base/BaseActionbarActivity.java
	MyHelper/src/com/devmaster/myhelper/adapters/TreatmentAdapter.java
	MyHelper/src/com/devmaster/myhelper/api/callservice/CallService.java
	MyHelper/src/com/devmaster/myhelper/database/sqlite/DatabaseHelper.java
	MyHelper/src/com/devmaster/myhelper/dialogs/dialogSelectDateTime.java
	MyHelper/src/com/devmaster/myhelper/fragment/ChangePasswordFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/CurrentEventFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/EventDetailFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/HistoricEventFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/HowfrequentlyFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/InputAmountFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/InputNumberOfDoseFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/InputTreatmentNameFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/LoginFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/MainScreenFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/NewEventFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/RegisterFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/RegisterTreatmentFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/SettingFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/StartScreenFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/TreatmentUseFragment.java
	MyHelper/src/com/devmaster/myhelper/fragment/ViewSavedTreatmentFragment.java
	MyHelper/src/com/devmaster/myhelper/models/EventModel.java
	MyHelper/src/com/devmaster/myhelper/models/TreatmentModel.java
	MyHelper/src/com/devmaster/myhelper/models/UserModel.java
	MyHelper/src/com/devmaster/myhelper/utils/notification/alert/NotificationAlert.java
	MyHelper/src/com/devmaster/myhelper/utils/preference/MyPreferenceManager.java