More work with cards
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/ispv2.js