Fixes:390 UserList sort by name ASC
REFS:255 Internationalization minor text change
REFS: #255 internatinalisation changes
Merge branch 'biodiv2.0' of https://github.com/sathishinlinux/biodiv into biodiv2.0
FIXES:#400 Minor syntax issue
REFS:#255 Activityfeed static string in locale
Merge branch 'biodiv2.0' of https://github.com/sathishinlinux/biodiv into biodiv2.0

Conflicts:
	grails-app/i18n/messages.properties
	grails-app/i18n/messages_fr.properties
Merge branch 'biodiv2.0' of https://github.com/strandls/biodiv into biodiv2.0
adding acitivity on post/unpost
FIXES: #403  Species bulk upload - sub-genus
Merge pull request #87 from sathishinlinux/biodiv2.0

Fixes:390 UserList sort by name ASC
Merge branch 'biodiv2.0' of github.com:strandls/biodiv into biodiv2.0
REFS:#255 Minor one more check for acticitytype
Merge branch 'biodiv2.0' of https://github.com/strandls/biodiv into biodiv2.0
REFS:#255 Minor More/Hide
FIXES:404 due to raw() htmlencode
REFS: #255 Internationalisation changes
Merge branch 'biodiv2.0' of https://github.com/sathishinlinux/biodiv into biodiv2.0
REFS: #255 Internationalisation changes
REFS: #255 Internationalisation changes