content updates from live site and ctags files
resolving merge conflicts