Merge branch 'master' of https://github.com/yada-ITA/r2

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/repairorder.rb
Merge branch 'master' of https://github.com/yada-ITA/r2

Conflicts:
	Gemfile
	app/models/engineorder.rb
	db/schema.rb
Merge branch 'master' of https://github.com/yada-ITA/r2

Conflicts:
	db/schema.rb
to fix Heroku & PG ploblem
to fix Heroku & PG ploblem
fix problem on camel case
fix problem on camel case and rebase db migration
clean migration files for rebase
clean fixture files
remove some fixtures
fix problem on camel case and rebase db migration
Merge pull request #22 from sankai/master

Postgreのキャメルケース項目名の問題に対応（導入手順はreadmeをご覧ください）