change layout for coherence
change layout for coherence
Merge remote-tracking branch 'origin/master'

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