Squashed commit of the following:

commit 63e6f648fdf2560571298f454b9d15e63b7c3e5a
Merge: e67ba28 ad00791
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:15:48 2014 +0800

    Merge commit 'ad007910def819774334671cebad105f7ae746d9' into 7.x-1.x-2014-08-30

    Conflicts:
    	modules/feature/topic/topic.info

commit ad007910def819774334671cebad105f7ae746d9
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:14:31 2014 +0800

    Squashed 'modules/feature/topic/' changes from 5dbec9f..ef950bb

    ef950bb Mod: Use field_base.module instead of body_field_definition.module.
    75afa57 === 7.x-0.2 === New: Relation: Master. New: Relation: Slave. New: Make Node: Topic as OG: Group. New: Make Node: Subject as OG: Group Content. Mod: Use safeword.module instead of machine_name.module to generate machine readable text.

    git-subtree-dir: modules/feature/topic
    git-subtree-split: ef950bbc27bde3e57282112317982bd27933f7ac

commit e67ba288b3542d3e02e24f577f84164b7d631a63
Merge: 83d0aa3 7782e9c
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:14:19 2014 +0800

    Merge commit '7782e9c9533f232936b3668bd24c91859ad68113' into 7.x-1.x-2014-08-30

commit 7782e9c9533f232936b3668bd24c91859ad68113
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:14:19 2014 +0800

    Squashed 'modules/feature/page/' changes from 42467a0..e54ad6b

    e54ad6b Mod: Use field_base.module instead of body_field_definition.module.

    git-subtree-dir: modules/feature/page
    git-subtree-split: e54ad6b3e57d68cb55f290838e3af7a68d86edcd

commit 83d0aa350b65babd33aab463aed298be2c43c959
Merge: c3de3b9 12bc3a1
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:14:04 2014 +0800

    Merge commit '12bc3a12ab7d872f660a67eea92323b0d7f46b15' into 7.x-1.x-2014-08-30

commit 12bc3a12ab7d872f660a67eea92323b0d7f46b15
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:14:04 2014 +0800

    Squashed 'modules/feature/news/' changes from abfd3d7..44c774c

    44c774c Mod: Use field_base.module instead of body_field_definition.module.

    git-subtree-dir: modules/feature/news
    git-subtree-split: 44c774c185e13bd98a7010c1e9100fa52969a28e

commit c3de3b94514d9e85a8ae2010bf2b91c798913aa4
Merge: 4b3570a 8a55d20
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:13:51 2014 +0800

    Merge commit '8a55d20ceff239ed748d6aa80325d3c23c191c98' into 7.x-1.x-2014-08-30

commit 8a55d20ceff239ed748d6aa80325d3c23c191c98
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:13:51 2014 +0800

    Squashed 'modules/feature/article/' changes from 81997d7..5e2fd16

    5e2fd16 Mod: Use field_base.module instead of body_field_definition.module.

    git-subtree-dir: modules/feature/article
    git-subtree-split: 5e2fd16d8af3bd636c1051fc79e48c3e333aac4a

commit 4b3570a13053bfa06f8e8f73ea3f65bb8b84c06f
Merge: b39839e 65e9126
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:09:12 2014 +0800

    Merge commit '65e912675b66201f06f5bd4739e63d885e184840' as 'modules/feature/news'

commit 65e912675b66201f06f5bd4739e63d885e184840
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:09:12 2014 +0800

    Squashed 'modules/feature/news/' content from commit abfd3d7

    git-subtree-dir: modules/feature/news
    git-subtree-split: abfd3d7e90dbabe7a877f38c7865053139656ccf

commit b39839e3f3b7080c605289e6fb409c5fd1f1f5e5
Merge: 19e90ea 09fe203
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:08:40 2014 +0800

    Merge commit '09fe203e958caf3de441ca4be8afcc33bcca0518' as 'modules/feature/field_base'

commit 09fe203e958caf3de441ca4be8afcc33bcca0518
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:08:40 2014 +0800

    Squashed 'modules/feature/field_base/' content from commit 9d6a5f1

    git-subtree-dir: modules/feature/field_base
    git-subtree-split: 9d6a5f1992f1b5e444175d3b0fa9018bb755a7ba

commit 19e90ea2ff47b69a2e3024b790ccaac881c373a4
Author: Kolier <kolier.li@gmail.com>
Date:   Sat Aug 30 12:07:03 2014 +0800

    Del: Remove body_field_definition.module, will use field_base.module to take place.