Removed deprecated *Holders and replaced them with new grails.util.Holders
Removed surplus resource
Merge branch 'remove-deprecated'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	grails-app/conf/FontAwesomePluginResources.groovy
Merge branch 'master' of https://github.com/halfbaked/grails-font-awesome-resources
New Font-Awecome 4.2.0 resources replaces old resources. Also includes sass resources
Fixing paths in css (sorry about that)
My first attempt to fix the resource mapper does in fact not work. This one seems to be working.
Merge pull request #33 from sbglasius/ResourceMapperTake-2

Resource mapper take 2