First round of changes for MeritBadgeCounselors
First round of Infusionsoft integration changes
Merge branch 'master' of github.com:smartytime/scoutinghub
Merge branch 'master' of github.com:smartytime/scoutinghub

Conflicts:
	grails-app/i18n/messages.properties
	grails-app/i18n/messages_da.properties
	grails-app/i18n/messages_de.properties
	grails-app/i18n/messages_es.properties
	grails-app/i18n/messages_fr.properties
	grails-app/i18n/messages_it.properties
	grails-app/i18n/messages_ja.properties
	grails-app/i18n/messages_nl.properties
	grails-app/i18n/messages_pt_BR.properties
	grails-app/i18n/messages_pt_PT.properties
	grails-app/i18n/messages_ru.properties
	grails-app/i18n/messages_th.properties
	grails-app/i18n/messages_zh_CN.properties
	grails-app/views/leader/view.gsp
Merge ssh://192.168.2.132/Users/ericm/Projects/scoutinghub

Conflicts:
	grails-app/controllers/scoutinghub/LeaderController.groovy
Merge branch 'master' of github.com:smartytime/scoutinghub
Checking in partial merit badge counselor stuff
Merge ssh://192.168.2.118/Users/ericm/Projects/scoutinghub
Committing basic merit badge counselor stuff
Further migration to elasticsearch, with some geo-specific queries
Committing more geo-point scanning, including a modified elasticsearch plugin
Partial changes for geo indexing (migrating from geocoder.us to yahoo)
Index marshalling
Merge branch 'master' of github.com:smartytime/scoutinghub

Conflicts:
	application.properties
Stash application
Merit badge counselor information #1
Fixing some of the scoutinghub issues
Making more changes
Committing wood theme
Committing some css changes for scoutinghub