Restored proper version of plugin_ajaxselect (fixing error)
Resolving merge conflict, keeping newest version (from origin) of submodules