Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
gemfile.lock
add production evernote
Merge branch 'develop'
fix login_dev
error.errorCode
remove errorcode for debug
Merge branch 'master' into develop