DB migration for #140
Updated MVC for #140, ability to assign software to asset (incomplete)
More edits for #140
Updated changelog
Updated changelog
Fixed #140
Merge branch 'refs/heads/feature/add-asset-to-software' into develop

Conflicts:
	app/controllers/admin/LicensesController.php
Merge remote-tracking branch 'origin/develop'