Merge pull request #18 from ivanStraltsou/dev

merged app.js
edit page fixes