Small changes
Resolved conflicts
Merge branch 'master' of github.com:raspstephan/documents