REFS: #480 Comment stream in group pages seem to have language option
Merge branch 'biodiv2.0' of https://github.com/sathishinlinux/biodiv into biodiv2.0
REFS :#495 Nullpointer for displayName in search sidebar
REFS: #503 Error while locking observation
Merge pull request #112 from sathishinlinux/biodiv2.0

FIXES: #480,#495,#503
REFS: #480, #495,#503 Merge branch 'master' into biodiv2.0

Conflicts:
	grails-app/controllers/utils/NewsletterController.groovy
Merge remote-tracking branch 'strandls/master'
FIXES: #504 Featured activity feed message not having proper spaces in
text
migration sql and script for bhutan deployment refs: #499
Merge branch 'master' of https://github.com/strandls/biodiv
Maps changes
Merge remote-tracking branch 'strandls/master'