TRUNK-4286: Proposed changes done and liquibase changeset added

 > Don't worry about adding the conceptClasses field, it will be done as part of TRUNK-4288 but please include the column in the DB for now
I haven't added it in the liquibase changeset, please review