added new fields to organisation model

added lookup of organisation by user

merged with master

fixed migration