Merging rename into master.
Merging rename into master.

# Conflicts:
#	IETF Meeting Schedule/build.gradle
#	IETF Meeting Schedule/src/main/AndroidManifest.xml
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/io/LocalExecutor.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/io/Meeting.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/provider/ScheduleContract.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/provider/ScheduleDatabase.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/provider/ScheduleProvider.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/service/SyncService.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/BaseActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/BaseMultiPaneActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/BaseSinglePaneActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/DashboardFragment.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/HomeActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/ScheduleFragment.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/SessionDetailFragment.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/SessionsFragment.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/StarredActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/TracksAdapter.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/TracksFragment.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/WellNoteActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/WellNoteFragment.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/WhatsOnFragment.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/phone/ScheduleActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/phone/SessionDetailActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/phone/SessionsActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/phone/TracksActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/tablet/ScheduleMultiPaneActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/tablet/SessionsMultiPaneActivity.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/tablet/TracksDropdownFragment.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/widget/BezelImageView.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/widget/BlockView.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/widget/BlocksLayout.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/widget/DashboardLayout.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/widget/ObservableScrollView.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/widget/TimeRulerView.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/ui/widget/Workspace.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/ActivityHelper.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/ActivityHelperHoneycomb.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/CatchNotesHelper.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/DetachableResultReceiver.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/FractionalTouchDelegate.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/Lists.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/Maps.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/MotionEventUtils.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/NotifyingAsyncQueryHandler.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/ParserUtils.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/ReflectionUtils.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/SelectionBuilder.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/Sets.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/SimpleMenu.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/SimpleMenuItem.java
#	IETF Meeting Schedule/src/main/java/org/ietf/ietfsched/util/UIUtils.java
#	IETF Meeting Schedule/src/main/res/layout-land/activity_home.xml
#	IETF Meeting Schedule/src/main/res/layout-xlarge-land-v11/activity_home.xml
#	IETF Meeting Schedule/src/main/res/layout-xlarge-v11/activity_home.xml
#	IETF Meeting Schedule/src/main/res/layout-xlarge-v11/activity_schedule.xml
#	IETF Meeting Schedule/src/main/res/layout-xlarge-v11/activity_sessions.xml
#	IETF Meeting Schedule/src/main/res/layout/activity_home.xml
#	IETF Meeting Schedule/src/main/res/layout/blocks_content.xml
#	IETF Meeting Schedule/src/main/res/layout/fragment_schedule.xml
#	IETF Meeting Schedule/src/main/resources/org/ietf/ietfsched/ui/.build
#	app/src/main/java/org/dalmasso/ietfsched/io/LocalExecutor.java
#	app/src/main/java/org/dalmasso/ietfsched/io/Meeting.java
#	app/src/main/java/org/dalmasso/ietfsched/provider/ScheduleContract.java
#	app/src/main/java/org/dalmasso/ietfsched/provider/ScheduleDatabase.java
#	app/src/main/java/org/dalmasso/ietfsched/provider/ScheduleProvider.java
#	app/src/main/java/org/dalmasso/ietfsched/service/SyncService.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/BaseActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/BaseMultiPaneActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/BaseSinglePaneActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/DashboardFragment.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/HomeActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/ScheduleFragment.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/SessionDetailFragment.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/SessionsFragment.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/StarredActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/TracksAdapter.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/TracksFragment.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/WellNoteActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/WellNoteFragment.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/WhatsOnFragment.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/phone/ScheduleActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/phone/SessionDetailActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/phone/SessionsActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/phone/TracksActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/tablet/ScheduleMultiPaneActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/tablet/SessionsMultiPaneActivity.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/tablet/TracksDropdownFragment.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/widget/BezelImageView.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/widget/BlockView.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/widget/BlocksLayout.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/widget/DashboardLayout.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/widget/ObservableScrollView.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/widget/TimeRulerView.java
#	app/src/main/java/org/dalmasso/ietfsched/ui/widget/Workspace.java
#	app/src/main/java/org/dalmasso/ietfsched/util/ActivityHelper.java
#	app/src/main/java/org/dalmasso/ietfsched/util/ActivityHelperHoneycomb.java
#	app/src/main/java/org/dalmasso/ietfsched/util/CatchNotesHelper.java
#	app/src/main/java/org/dalmasso/ietfsched/util/DetachableResultReceiver.java
#	app/src/main/java/org/dalmasso/ietfsched/util/FractionalTouchDelegate.java
#	app/src/main/java/org/dalmasso/ietfsched/util/Lists.java
#	app/src/main/java/org/dalmasso/ietfsched/util/Maps.java
#	app/src/main/java/org/dalmasso/ietfsched/util/MotionEventUtils.java
#	app/src/main/java/org/dalmasso/ietfsched/util/NotifyingAsyncQueryHandler.java
#	app/src/main/java/org/dalmasso/ietfsched/util/ParserUtils.java
#	app/src/main/java/org/dalmasso/ietfsched/util/ReflectionUtils.java
#	app/src/main/java/org/dalmasso/ietfsched/util/SelectionBuilder.java
#	app/src/main/java/org/dalmasso/ietfsched/util/Sets.java
#	app/src/main/java/org/dalmasso/ietfsched/util/SimpleMenu.java
#	app/src/main/java/org/dalmasso/ietfsched/util/SimpleMenuItem.java
#	app/src/main/java/org/dalmasso/ietfsched/util/UIUtils.java
#	app/src/main/java/org/ietf/ietfsched/io/LocalExecutor.java
#	app/src/main/java/org/ietf/ietfsched/io/Meeting.java
#	app/src/main/java/org/ietf/ietfsched/provider/ScheduleContract.java
#	app/src/main/java/org/ietf/ietfsched/provider/ScheduleDatabase.java
#	app/src/main/java/org/ietf/ietfsched/provider/ScheduleProvider.java
#	app/src/main/java/org/ietf/ietfsched/service/SyncService.java
#	app/src/main/java/org/ietf/ietfsched/ui/BaseActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/BaseMultiPaneActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/BaseSinglePaneActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/DashboardFragment.java
#	app/src/main/java/org/ietf/ietfsched/ui/HomeActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/ScheduleFragment.java
#	app/src/main/java/org/ietf/ietfsched/ui/SessionDetailFragment.java
#	app/src/main/java/org/ietf/ietfsched/ui/SessionsFragment.java
#	app/src/main/java/org/ietf/ietfsched/ui/StarredActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/TracksAdapter.java
#	app/src/main/java/org/ietf/ietfsched/ui/TracksFragment.java
#	app/src/main/java/org/ietf/ietfsched/ui/WellNoteActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/WellNoteFragment.java
#	app/src/main/java/org/ietf/ietfsched/ui/WhatsOnFragment.java
#	app/src/main/java/org/ietf/ietfsched/ui/phone/ScheduleActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/phone/SessionDetailActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/phone/SessionsActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/phone/TracksActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/tablet/ScheduleMultiPaneActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/tablet/SessionsMultiPaneActivity.java
#	app/src/main/java/org/ietf/ietfsched/ui/tablet/TracksDropdownFragment.java
#	app/src/main/java/org/ietf/ietfsched/ui/widget/BezelImageView.java
#	app/src/main/java/org/ietf/ietfsched/ui/widget/BlockView.java
#	app/src/main/java/org/ietf/ietfsched/ui/widget/BlocksLayout.java
#	app/src/main/java/org/ietf/ietfsched/ui/widget/DashboardLayout.java
#	app/src/main/java/org/ietf/ietfsched/ui/widget/ObservableScrollView.java
#	app/src/main/java/org/ietf/ietfsched/ui/widget/TimeRulerView.java
#	app/src/main/java/org/ietf/ietfsched/ui/widget/Workspace.java
#	app/src/main/java/org/ietf/ietfsched/util/ActivityHelper.java
#	app/src/main/java/org/ietf/ietfsched/util/ActivityHelperHoneycomb.java
#	app/src/main/java/org/ietf/ietfsched/util/CatchNotesHelper.java
#	app/src/main/java/org/ietf/ietfsched/util/DetachableResultReceiver.java
#	app/src/main/java/org/ietf/ietfsched/util/FractionalTouchDelegate.java
#	app/src/main/java/org/ietf/ietfsched/util/Lists.java
#	app/src/main/java/org/ietf/ietfsched/util/Maps.java
#	app/src/main/java/org/ietf/ietfsched/util/MotionEventUtils.java
#	app/src/main/java/org/ietf/ietfsched/util/NotifyingAsyncQueryHandler.java
#	app/src/main/java/org/ietf/ietfsched/util/ParserUtils.java
#	app/src/main/java/org/ietf/ietfsched/util/ReflectionUtils.java
#	app/src/main/java/org/ietf/ietfsched/util/SelectionBuilder.java
#	app/src/main/java/org/ietf/ietfsched/util/Sets.java
#	app/src/main/java/org/ietf/ietfsched/util/SimpleMenu.java
#	app/src/main/java/org/ietf/ietfsched/util/SimpleMenuItem.java
#	app/src/main/java/org/ietf/ietfsched/util/UIUtils.java
#	app/src/main/resources/org/dalmasso/ietfsched/ui/.build
#	app/src/main/resources/org/ietf/ietfsched/ui/.build

Start making changes for IETF100.

d-ellebasi/ietfsched,d-ellebasi/ietfsched,d-ellebasi/ietfsched