Add gemini and memento changes
Merge branch 'sto940' of github.com:Metaswitch/sprout into sto940_em

Conflicts:
	mk/sprout.mk
	sprout/Makefile
Fix memento build issue
Rename packages
Merge pull request #792 from Metaswitch/sto940_em

[Reviewer: Mike] Sto940 em