Typo.
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/s3db/hrm.py
Fix for member profile => update training
Fix missing icons.
Back out last change to avoid conflict.
Merge branch 'master' of git://github.com/flavour/eden
Put change back, propagate.
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/ifrc