Merge branches 'brandon' and 'master' into brandon
removed unneeded migration
Merge branches 'master' and 'brandon'