Changed buscard form to use a class
Merge branch 'master' of https://github.com/Knine-Media/knine

Conflicts:
	public/Gladiator.php