Added checks for organisation and added field in admin
Merge branch 'master' into production
Fixed bug with project tagging
Merge branch 'master' into production