Added @Column to the MembershipObject to avoid conflict with MySQL reserved words.
Merge remote-tracking branch 'upstream2/master'