merge back the stuff from virtkick-webapp