add Gemfile -thin
#1から#4反映
change application.html.erb
Merge pull request #80 from tamuratt/develop

公開後の指摘対応ほか
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
Merge branch 'master' of heroku.com:pjsearch-staging into staging

Conflicts:
	Gemfile
	Gemfile.lock
userの追加，ＣＳＶファイル分割対応の見直し
Merge pull request #81 from tamuratt/develop

userの追加，ＣＳＶファイル分割対応の見直し
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
ユーザー情報のダウンロード項目追加
Merge pull request #82 from tamuratt/develop

ユーザー情報のダウンロード項目追加
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
Merge branch 'staging' of http://github.com/ttamura204/pjSearch
TopicのcontensをｓｔｒｉｎｇからTextに変更
Merge pull request #83 from tamuratt/develop

TopicのcontensをstringからTextに変更
Merge branch 'develop' of http://github.com/ttamura204/pjSearch into staging
Merge branch 'staging' of http://github.com/ttamura204/pjSearch