fix some merge issues and fix maven assembly bugs. Start Gravatar integration