CardScrollActivity
Merge branch 'master' of https://github.com/nkp/ichack14

Conflicts:
	.classpath