- updated database model
- db update #2
- Final tweaks to the design
- fixed search
Merge remote-tracking branch 'origin/master' into jamie_dev