small code refactor for Application
refactor waterline.d.ts
update typescript jison grammar