Process of register vehicle by consortium.
Merge branch 'master' into scheduling
Merge branch 'scheduling'

Conflicts resolved:
	.zfproject.xml
	library/Application/Acl/Setup.php