18072014-1635
Merge branch 'master' into devel

Conflicts:
	install/install-cards.sh
Update install-cards.sh
Merge branch 'devel'
Revert "15072014-1600"

This reverts commit 1f4423d2366294134743704b9c3155179a952fe4.