Stash
Merge branch 'master' of github.com-micabyte:micabyte/lib_base

Conflicts:
	src/main/java/com/micabyte/android/app/BaseFragment.java