ignored docs
userena templates
organization
organization
conflict resolved
removed unused templates