Harry: readding stuff that disappeared due to merge issue
Merge branch 'dev' of https://github.com/FCPDIT/TeamProject.git into dev