Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_v4_21_0_2.xml
	SlidingMenu/SlidingMenu.iml
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/res/drawable/ripple_standard.xml
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/values-v21/styles.xml
	app/src/main/res/values/colors.xml
	app/src/main/res/values/styles.xml