Merge branch 'master' into facebook

Conflicts:
	media-fever-android/AndroidManifest.xml
	media-fever-android/src/main/java/com/mediafever/android/ui/settings/SocialSettingsFragment.java
Merge branch 'facebook' of github.com:maxirosson/media-fever into facebook