FIXES: #383 checklist will show when logged in
Merge branch 'master' of https://github.com/strandls/biodiv
FIXES: #384 map icons
FIXES: #384 map icons
Adding a language id for featured table
Merge branch 'biodiv2.0' of https://github.com/sathishinlinux/biodiv into biodiv2.0
Merge branch 'biodiv2.0' of https://github.com/strandls/biodiv into biodiv2.0
FIXES: #383 #339 checklist show error for logged in user
REFS: #339 showing checklist obv lat lng points
Merge pull request #83 from sathishinlinux/biodiv2.0

REFS : #255 Adding a language id for featured table
REFS: #383 #339 Merge branch 'master' into biodiv2.0

Conflicts:
	grails-app/conf/Config.groovy
Merge branch 'biodiv2.0' of github.com:strandls/biodiv into biodiv2.0
FIXES: #382 Document upload- file does not get uploaded
Merge branch 'biodiv2.0' into comment