merges, little fixes, next step chart jsonp
chart using json ajax call then passing data to d2
chart fix, login logout from main page