var's variables in services to comply with use strict
Cleaned up order in which services are passed into directives
Went through controllers as well
Added comma
Merge pull request #2621 from ten24/feature-jsDirectoryCleanup

Feature js directory cleanup
Merge branch 'feature' of https://github.com/ten24/Slatwall.git into feature-hbnullRbKey
Added back original attribute in addition