error

error
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
fix merge issues
Fix null pointer exception bugs
fix layout
commit
latest commit
New Database ORM where each model file is in charge of updating itself. Using new files in order not to conflict with existing files in use
DeckModel save() function added. save() takes care of committing to database
Deck.load(), Card.load() and Card.reload() implemented
Added Camera Type to CardModel
DeckModel.all(context) is implemented
destroy() action added to both card and deck
Card management added to the deck
Merge branch 'FrescoORM' of github.com:allwinpb/Fresco into FrescoORM