use new branche
Merge remote-tracking branch 'origin/master' into Nachesi
field observation - notification
Merge remote-tracking branch 'origin/master' into Nachesi
Merge remote-tracking branch 'origin/master' into Nachesi
vehicle edited and automatic crv - estructure
register edited - estructure
user_id bug - structure
Merge remote-tracking branch 'origin/master' into Nachesi

Conflicts:
	application/controllers/FleetController.php
accept edited
end vehicle edited - automatic crv
Merge remote-tracking branch 'origin/master' into Nachesi

Conflicts:
	.zfproject.xml
	application/controllers/FleetController.php
	application/models/Vehicle.php
	library/Application/Acl/Setup.php