Merge branch 'v2.0'

Conflicts:
	db/schema.rb
Gemfile.lock added
Merge branch 'master' of ssh://github.com/akiko74/dqx_items
Typo fixed