works for front/back tabs and text/doodle/image/camera tabs

however, i havent implemented doodle, image and camera yet
Merge remote-tracking branch 'origin/master'

Conflicts:
	Fresco/AndroidManifest.xml
	Fresco/res/layout/activity_add_edit.xml