updated bashrc and changed apache config for user profile for user profile upload_resource
moved filepicker key to config
Handling no extension images not to show full resolution pics in gallery. Changed order of spring security core and resources plugin orders. upgraded spring security code to 1.2.7.3
minor
removed redundant call.
added observed on date to description
Merge branch 'biodiv_usergroups' of github.com:strandls/biodiv into biodiv_usergroups
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...