Updated versions to 3.2.5.
Merge remote-tracking branch 'origin/dev'

Conflicts:
	services/Conrad/project.clj
	services/Donkey/project.clj
	services/JEX/project.clj
	services/iplant-email/project.clj
	services/metadactyl-clj/project.clj
	services/monkey/project.clj
Merge branch 'dev'
Merge branch 'dev'
fixed a typo.