mostly submodule updates
Resolving merge conflict
Ajax and theme fixes.