rails 4 upgrade
fix
remove debug
convert notes to text
Merge branch 'master' into us