add column 'phonenumber' and 'major' to user
#37 add a shortenURL column to Gate
#37 add info about gate to admin page
Merge pull request #39 from DonutWorks/feat/user-profile-more-detail

add column 'phonenumber' and 'major' to user #34
Merge branch 'master' of https://github.com/DonutWorks/Ari into feat/issue-#37

Conflicts:
	app/views/admin/index.html.erb
	db/schema.rb
Merge pull request #41 from DonutWorks/feat/issue-#37

Feat/issue #37 추가한 Gate 정보 보기
Merge branch 'master' of https://github.com/DonutWorks/Ari into bug/no-devise-auth-to-create-gate

Conflicts:
	app/controllers/gates_controller.rb