for pull
Merge branch 'master' of https://github.com/daniyuu/GiveMeFive

Conflicts:
	Givemefive/.gradle/1.10/taskArtifacts/cache.properties.lock
	Givemefive/.gradle/1.10/taskArtifacts/fileHashes.bin
	Givemefive/.gradle/1.10/taskArtifacts/fileSnapshots.bin
	Givemefive/.gradle/1.10/taskArtifacts/taskArtifacts.bin
	Givemefive/.idea/gradle.xml
	Givemefive/.idea/libraries/appcompat_v7_19_0_0.xml
	Givemefive/Givemefive.iml
	Givemefive/app/app.iml
	Givemefive/local.properties