Fixed warnings when usung phpDocumentor 2.6.1.
Partial support for extended download options.

Conflicts:
	application/models/Computer.php
Workaround for database deadlock when merging package assignments.
Set fetch mode explicitly to avoid unpredictable locking errors.
Merged OCSinventory server 2.1.2.

Conflicts:
	CHANGELOG.txt
Migrated AddToGroup form.
Show stack trace for nested exceptions.