Added target self to getAdminLoginHTML in the authentication cfc of mura
Merge pull request #2656 from ten24/feature-ds-loginWithMuraLink

Added target self to getAdminLoginHTML in the authentication cfc of mura
Fixes issue with removing orderFulfillments and orderReturns
Fixes issues with paymentTerm being automatically added
see fix https://github.com/angular-ui/bootstrap/pull/2535/files
More fixes on return orders
Updated Version 3.5.020
Merge branch 'master' into develop

Conflicts:
	model/service/OrderService.cfc
	version.txt
Merge branch 'develop' into feature
committing current work
Merge branch 'feature' of https://github.com/ten24/Slatwall into feature-4-dynamicjs