Merged in swiffer_web front end proj