Integrate gemini into sprout
Code review markups
Merge remote-tracking branch 'origin/master' into gemini

Conflicts:
	modules/cpp-common
Merge pull request #1 from Metaswitch/gemini

Integrate gemini into sprout

Conflicts:
	sprout/Makefile
Add gemini
Merged in add_gemini (pull request #2)

[No reviewer] Add gemini
Change gemini submodule
Merged in change_gemini_mod (pull request #3)

Change gemini submodule
Add memento
Merged in add_memento (pull request #4)

Add memento
Fix memento app server
Merged in memento_fix (pull request #5)

Fix memento app server
Merge remote-tracking branch 'origin/dev' into bitbucket-dev
Take latest app servers code
Merge remote-tracking branch 'origin/dev' into bitbucket-dev

Conflicts:
	sprout/main.cpp
Take latest memento
Merge remote-tracking branch 'origin/dev' into bitbucket-dev
Make gemini disabled by default
Merged in gemini_enable (pull request #6)

Make gemini disabled by default
Merge remote-tracking branch 'origin/dev' into github-dev