change some codes
Merge branch 'master' of https://github.com/allwinpb/Fresco

Conflicts:
	Fresco/res/layout/list_deck.xml