first commit
Merge branch 'dev' into 654_N
Merge branch 'dev' into 654_N

Conflicts:
	db/schema.rb
Merge branch 'dev' into 654_N
i18n
fix merge
Merge pull request #57 from is-valid/654_N

654 n