restructured app, used Gulp for js concat and minification
commiting platform files
fixing conflicts