Merge pull request #1 from ARTFL-Project/master

update branch
refine page navigation
more fixes to page navigation
reorganize functions and delete some files
remove old javascript file
move javascript file to js folder, plsu other improvements
remove file
Merge pull request #7 from clovis/master

Push changes to head
clean up and fix bug with scroll position
Merge pull request #8 from clovis/master

Bug fixes