Merge branch 'current'
2 views function correctly

Ajax request of js view of each page
Merge branch 'master' into current