Android lollipop update

Début de la mise à jour Material Design :D
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.idea/libraries/palette_v7_21_0_0.xml
	.idea/libraries/support_annotations_20_0_0.xml
	.idea/workspace.xml
	app/app.iml
	app/build/intermediates/incremental/mergeAssets/debug/merger.xml
	app/build/intermediates/incremental/mergeResources/debug/merger.xml
	app/build/intermediates/res/debug/layout-xlarge-mdpi-v4/main.xml
	app/build/intermediates/res/debug/layout/activity_fragment.xml
	app/build/intermediates/res/debug/values-fr/values.xml
	app/build/intermediates/res/debug/values-xlarge-mdpi-v4/values.xml
	app/build/intermediates/res/debug/values/values.xml
	build/intermediates/model_data.bin
	local.properties