Try to pull
Merge branch 'master' of https://github.com/Ethanator/Carefree

Conflicts:
	CarefreeAndroid/CarefreeAndroid/Carefree/src/main/java/com/carefree/carefree/ExampleAppWidgetProvider.java