Update gradle and add augment compileSdkVersion to 21
Merge branch 'master' of https://github.com/gdingenen/Caldroid

Conflicts:
	caldroid/src/main/res/values-v21/styles.xml
	caldroidSampleActivity/src/main/res/values-v21/styles.xml