pre-merge
Merge branch 'master' of https://github.com/mrgoodboy/dossier
merged with everyone