#140 뷰에 무조건전화번호는 짝대기 나오도록
uncreat invalid format data
add user's view about member's format error
gem updated. bug fixed from gem (#146)
#147 Devise 제거하고도 동작 가능하도록
remove background color
피드백 반영
Merge branch 'remove-devise' into always_pass_whether_phonenumber_is_valid_or_invalid

Conflicts:
	Guardfile
	spec/unit/helpers/users_helper_spec.rb
#139 전화번호 - 없이도 인증 가능
#140 적용되지 않았던 뷰까지 적용하고 표현 조건에 대해 보다 더 구체화시킨다
refactoring validation in User.rb
add new column names to phone_number
add normalization words and change to column names in excel import
Merge pull request #141 from DonutWorks/feat/can-see-unstructed-comments

Feat/can see unstructed comments
Merge pull request #150 from DonutWorks/feat/can-see-whether-excel-data-is-imported-or-not

Feat/can see whether excel data is imported or not
Merge pull request #152 from DonutWorks/bug/fix-duplicated-read-activity

gem updated. bug fixed from gem (#146)
Merge branch 'master' of https://github.com/DonutWorks/Ari into always_pass_whether_phonenumber_is_valid_or_invalid

Conflicts:
	app/controllers/admin/import_controller.rb
	app/models/user.rb
Merge pull request #156 from DonutWorks/always_pass_whether_phonenumber_is_valid_or_invalid

Always pass whether phonenumber is valid or invalid
Merge branch 'master' into develop

Conflicts:
	app/views/admin/gates/show.html.erb