ca
Merge branch 'master' of https://github.com/irunarae/securoid_project

Conflicts:
	server/bin/Server_App.class