Merged SherlockNavigationDrawer upstream into own fork