update jme-display.js
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Fix UserProfile creation
Actually fix UserProfile creation

Foreign key constraint failed due to mismatch between MySQL engines on
auth_user and accounts_userprofile.