add cookies + tray html/css
add app controller in js file
fix merge with master