Changes for Feature,Flag & Follow.Not Complete
New Files added
Changes without species userGroups
New Files
Species featured Done
Merge branch 'biodiv_groupPull' into biodiv_checklist

Conflicts:
	app-conf/apache-virtualhost-conf
	grails-app/conf/AppResources.groovy
	grails-app/domain/content/eml/Document.groovy
	grails-app/domain/species/participation/Follow.groovy
	grails-app/services/speciespage/ObservationService.groovy
	grails-app/views/common/observation/_addFlagTemplate.gsp
	grails-app/views/common/observation/_showObservationRelatedStoryTemplate.gsp
	grails-app/views/document/_documentListTemplate.gsp
	grails-app/views/document/show.gsp
	grails-app/views/observation/show.gsp
	web-app/js/species/carousel.js
Merge branch 'biodiv_groupPull' into biodiv_checklist
Feature changes with IBP as pseudo group and mail & activity feed update
Conflicts:
	grails-app/services/speciespage/ObservationService.groovy
Merge branch 'biodiv_groupPull' into biodiv_checklist
Minor
Conflicts:
	app-conf/apache-virtualhost-conf
	grails-app/conf/Config.groovy
	grails-app/domain/content/eml/Document.groovy
	grails-app/domain/species/participation/Observation.groovy
	grails-app/views/document/show.gsp
	grails-app/views/observation/show.gsp
	userscripts/loadData.groovy
Merge branch 'biodiv_usergroups' into biodiv_checklist

Conflicts:
	grails-app/services/speciespage/ObservationService.groovy
	grails-app/views/document/show.gsp
	grails-app/views/species/show.gsp
First Cut
Merge branch 'biodiv_usergroups' into biodiv_checklist
Merge pull request #16 from rksinha/biodiv_checklist

Needs to be tested...
Changes with abstract domain class and featureMigration Script and Flag
generalised
Document images added
Merge pull request #17 from rksinha/biodiv_checklist

Biodiv checklist
minor changes.
Flag Notes Fixed, Design changes
Merge pull request #18 from rksinha/biodiv_checklist

Flag Notes Fixed, Design changes
Show All done for species, observation & document
Merge pull request #19 from rksinha/biodiv_checklist

Show All done for species, observation & document
Merge branch 'biodiv_usergroups' into biodiv_checklist

Conflicts:
	grails-app/services/species/participation/ActivityFeedService.groovy
	grails-app/services/speciespage/ObservationService.groovy