Use properly ClassLoader to resolve WebJars resources
Clean unuse location of @Defines and add location for @Require(s)
Merge remote-tracking branch 'haint/amd-bugfix'
Merge remote-tracking branch 'haint/master'