changes from dropbox version
Merge branch 'master' of github.com:nicoladt/LaTeXThesisNew