fix merge error (DrawerItem, special events)
Merge branch 'gradle_fm' of github.com:gdg-x/frisbee into gradle_fm