some controller and migration changes
fixed merge
finished updated user database with api call
Merge pull request #7 from jsuich/models_and_data

Models and data