facebook added again
Merge remote-tracking branch 'origin/master'

Conflicts:
	shakalarm/AndroidManifest.xml
	shakalarm/res/values/strings.xml
	shakalarm/src/alarm/AlarmActivity.java
	shakalarm/src/facebook/package-info.java