less, asset, custom-bootstrap, and variables.less
Merge remote-tracking branch 'upstream/master'

Conflicts:
	grails-app/assets/javascripts/application.js
Merge pull request #3 from frnktrgr/master

less, asset, custom-bootstrap, and variables.less