merge changes from team app_wayponit.html