add support for bootstrap-3.1 as a plugin
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/layouts/Template/_questionTemplate.gsp