merged with web interface
vendor commission filter
Quiz fixes
fixed conflicts
payment controller
conflicts resolve