Merge pull request #6 from ARTFL-Project/master

Merge upstream
merge more stuff
fix javascript oversight
Merge pull request #24 from clovis/master

Fix css and merge moer code