Revert "Ticker 创建项目"

This reverts commit 2d553f08af389037da6057400025752d14aa4b6d.
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/R.txt
	gen/android/support/v7/appcompat/R.java
	gen/com/earth/ticker/R.java
	proguard-project.txt
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/earth/ticker/SkeletonActivity.java
添加了主界面，new fragment，item界面
合并了branch
删除对R文件的追踪
删除对R文件对追踪
合并后保存，R文件仍然无法生存
Merge branch 'duanxin12-master' of https://github.com/linyxy/Ticker into duanxin12-master
解决R问题后重新倒入github
从远内容中进行了merge，现在重新推送至github

Merge commit 'c8871442755c86db1b532686e673a65a8abbcc0b'

* commit 'c8871442755c86db1b532686e673a65a8abbcc0b':
  合并后保存，R文件仍然无法生存
  删除对R文件对追踪
  删除对R文件的追踪
  添加了主界面，new fragment，item界面
  完成了now页面的xml布局
  now 页面基本完成，尚未添加子任务显示
  开始编写now界面，增加一个新的颜色dark_grey
  尝试贴new_event_fragment到 ActivityNewEvent。 目前还没有完成
  创建了newEvent的activity和fragment，正在贴fragment和设置。框架已经完成
  修改了基础Theme，少量修改了页面。即将添加统一的action bar
  重新定制了new的页面。增加了space填充小格子。修改了editText的问题。目前行列已经对齐。缺少：一个复选框行。56个icon
  完成了新建事件的基础设置，增加了icon_selection控件，增加了各种style，
  add styles
  Revert "Ticker 创建项目"
  Ticker 创建项目

Conflicts:
	.project
	AndroidManifest.xml
	libs/android-support-v4.jar
	proguard-project.txt
	project.properties
	res/drawable-hdpi/drawer_shadow.9.png
	res/drawable-hdpi/ic_drawer.png
	res/drawable-hdpi/ic_launcher.png
	res/drawable-hdpi/sample_icon.png
	res/drawable-hdpi/view_pager_scroll.9.png
	res/drawable-mdpi/drawer_shadow.9.png
	res/drawable-mdpi/ic_drawer.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-mdpi/sample_icon.png
	res/drawable-xhdpi/drawer_shadow.9.png
	res/drawable-xhdpi/ic_drawer.png
	res/drawable-xhdpi/ic_launcher.png
	res/drawable-xxhdpi/drawer_shadow.9.png
	res/drawable-xxhdpi/ic_drawer.png
	res/drawable-xxhdpi/ic_launcher.png
	res/drawable/button_selector.xml
	res/drawable/button_shape.xml
	res/drawable/gradient_shape.xml
	res/layout/activity_main.xml
	res/layout/activity_new_event.xml
	res/layout/activity_skeleton.xml
	res/layout/custom_tab_view.xml
	res/layout/draw_list_item.xml
	res/layout/file_fragment.xml
	res/layout/finished_subtask_list.xml
	res/layout/fragment_navigation_drawer.xml
	res/layout/fragment_new_event.xml
	res/layout/fragment_now.xml
	res/layout/fragment_skeleton.xml
	res/layout/fragment_viewpager.xml
	res/layout/item_layout.xml
	res/layout/new_event_icon_selector.xml
	res/layout/now_sub_task_list_item.xml
	res/layout/time_fragment.xml
	res/layout/unfinished_subtask_list.xml
	res/menu/global.xml
	res/menu/main.xml
	res/menu/menu.xml
	res/menu/new_event.xml
	res/menu/skeleton.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values-w820dp/dimens.xml
	res/values/arrays.xml
	res/values/bools.xml
	res/values/colors.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/earth/ticker/DetailsEventActivity.java
	src/com/earth/ticker/DrawerFragment.java
	src/com/earth/ticker/FileFragment.java
	src/com/earth/ticker/NewEventActivity.java
	src/com/earth/ticker/NewEventFragment.java
	src/com/earth/ticker/NowActivity.java
	src/com/earth/ticker/NowFragment.java
	src/com/earth/ticker/SkeletonActivity.java
	src/com/earth/ticker/TimeFragment.java
合并后clean项目