Cleanup
Merge branch 'master' of github.com:credentials/irma_card_management

Conflicts:
	src/org/irmacard/cardmanagement/MainWindow.java