Merge remote-tracking branch 'origin/master' into Thierry

Conflicts:
	MyApp/AndroidManifest.xml
	MyApp/gen/com/example/myapp/R.java
	MyApp/project.properties
	MyApp/res/drawable/counter_bg.xml
	MyApp/res/drawable/list_item_bg_normal.xml
	MyApp/res/drawable/list_item_bg_pressed.xml
	MyApp/res/drawable/list_selector.xml
	MyApp/res/layout/activity_main.xml
	MyApp/res/layout/drawer_list_item.xml
	MyApp/res/layout/fragment_home.xml
	MyApp/res/layout/fragment_information.xml
	MyApp/res/layout/fragment_main.xml
	MyApp/res/layout/fragment_pages.xml
	MyApp/res/layout/fragment_quiz.xml
	MyApp/res/layout/fragment_semodel.xml
	MyApp/res/layout/fragment_whats_hot.xml
	MyApp/res/layout/gradient.xml
	MyApp/res/menu/main.xml
	MyApp/res/values-v11/styles.xml
	MyApp/res/values-v14/styles.xml
	MyApp/res/values-w820dp/dimens.xml
	MyApp/res/values/color.xml
	MyApp/res/values/dimens.xml
	MyApp/res/values/styles.xml
	MyApp/src/info/androidhive/slidingmenu/HomeFragment.java
	MyApp/src/info/androidhive/slidingmenu/Information.java
	MyApp/src/info/androidhive/slidingmenu/MainActivity.java
	MyApp/src/info/androidhive/slidingmenu/MyOnItemSelectedListener.java
	MyApp/src/info/androidhive/slidingmenu/PagesFragment.java
	MyApp/src/info/androidhive/slidingmenu/Quiz.java
	MyApp/src/info/androidhive/slidingmenu/SeModel.java
	MyApp/src/info/androidhive/slidingmenu/Sustainability.java
	MyApp/src/info/androidhive/slidingmenu/WhatsHotFragment.java

	MyApp/src/info/androidhive/slidingmenu/adapter/CustomOnItemSelectedListener.java

	MyApp/src/info/androidhive/slidingmenu/adapter/NavDrawerListAdapter.java
	MyApp/src/info/androidhive/slidingmenu/model/NavDrawerItem.java