llaki commit
Merge branch 'master' of https://github.com/Jilberta/CloudLibrary

Conflicts:
	gen/com/example/cloudlibrary/activities/R.java
	gen/com/facebook/android/R.java
	src/com/example/cloudlibrary/activities/MainActivity.java