First commit
jsjdsjsj
Merge remote-tracking branch 'upstream/biodiv_usergroups' into biodiv_usergroups
changed heading for bhutan
bashrc changes
apache conf changes
merged
Conf.groovy -> add external conf file to env.
observation service
Merge remote-tracking branch 'upstream/biodiv_usergroups' into biodiv_usergroups

Conflicts:
	.bashrc
	app-conf/apache-virtualhost-conf
	application.properties
	grails-app/conf/Config.groovy
Small changes in Config.groovy
Small changes...
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups

Conflicts:
	app-conf/apache-virtualhost-conf
External COnfig File
Fixed the issue of red hue for images.
Minor
By Rahul
1. Handling png images during crop.
2. Handling CMYK jpeg images during crop.
added missing file
Merge Conflicts resolving.

Conflicts:
	src/groovy/species/utils/ImageUtils.groovy
changed user profile picture size used in reco