update migrations
migrated
reconcile master and add_devise branches conflicts