test
Merge branch 'master' of
ssh://git@github.com/LifeApp/SimplerNavDrawer.git

Conflicts:
	MainActivity/bin/MainActivity.apk
	MainActivity/bin/resources.ap_