grunt builder and prototype app
fixing remote merge conflicts