Merge branch 'master' into develop

Conflicts:
	MoonfryeApp/src/main/java/com/moonfrye/android/ui/main/MFMainActivity.java
merged changes