OnLongClick

Added new layout for editing deck.
Added 16 icons for deck's icon.
Error

Error some normal github error
error

fixed errro
Merge remote-tracking branch 'origin/master'

Conflicts:
	Fresco/res/layout/add_deck.xml
	Fresco/res/layout/list_deck.xml
	Fresco/res/values/colors.xml