added gravatar support
Merge remote-tracking branch 'origin'

Conflicts:
	warBook/conf/routes