Bullet Fragment, ENUM
Merge branch 'master' of https://github.com/mpaddon/iFixitAndroid

Conflicts:
	App/res/layout/guide_create_steps_bullet_popup.xml
	App/src/com/dozuki/ifixit/guide_create/ui/GuideCreateStepsEditActivity.java

Merge