change tabs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Fresco/src/icreate/fresco/AddEditActivity.java
	Fresco/src/icreate/fresco/FrontBackCardFragment.java