Merge branch 'update-user-model' into 'master'

Add nickname column to user model

See merge request !348

db/migrate/20170109133754_add_nickname_to_user.rb

+class AddNicknameToUser < ActiveRecord::Migration[5.0]
+  def change
+    add_column :users, :nickname, :string
+  end
+end