use normal instead onormal for non-inherit edge.
modify conflict.
Merge branch 'develop' of gg:mongoid-erd-gem into develop