Merge branch 'biodiv2.0' of https://github.com/strandls/biodiv into biodiv2.0

Conflicts:
	grails-app/controllers/species/TaxonController.groovy
	grails-app/i18n/messages.properties
	grails-app/services/species/UtilsService.groovy
	grails-app/views/species/show.gsp
REFS: #255 Internationalization changes
Merge branch 'biodiv2.0' of https://github.com/sathishinlinux/biodiv into biodiv2.0

Conflicts:
	grails-app/services/speciespage/TaxonService.groovy
Merge branch 'biodiv2.0' of https://github.com/strandls/biodiv into biodiv2.0

Conflicts:
	grails-app/controllers/species/TaxonController.groovy
	grails-app/i18n/messages.properties
	grails-app/services/species/UtilsService.groovy
REFS : #255 modified changes of Internationalization
Merge branch 'biodiv2.0' of https://github.com/sathishinlinux/biodiv into biodiv2.0

Conflicts:
	grails-app/i18n/messages.properties
	grails-app/views/common/observation/_showObservationRecosTemplate.gsp
Merge branch 'biodiv2.0' of https://github.com/strandls/biodiv into biodiv2.0

Conflicts:
	grails-app/views/index.gsp
Merge branch 'biodiv2.0' of https://github.com/sathishinlinux/biodiv into biodiv2.0
FIXES:356 selection of language in header bar
REFS: #255 Merge branch 'master' into biodiv2.0

Conflicts:
	grails-app/i18n/messages.properties
	grails-app/views/domain/_ibpFooterTemplate.gsp
Merge pull request #66 from sathishinlinux/biodiv2.0

REFS: #255 Internatinalization addition
REFS: #255 bulk upload fixed
Merge branch 'biodiv2.0' of github.com:strandls/biodiv into biodiv2.0
REFS: #255 Merge branch 'biodiv2.0' into wikwio-staging

Conflicts:
	grails-app/i18n/messages.properties
	grails-app/views/domain/_ibpFooterTemplate.gsp
	grails-app/views/index.gsp