worked on view portion
Merge branch 'dev' of github.com:Thyfranck/textweb into dev