Common,E,Category,Category now implements Serializable,,no
Merge remote-tracking branch 'origin/master'