Add Customer resource
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	config/locales/ja.yml