new pages
json fix
requirments cleanup
Merge origin/master