fixed ContentsController
fixed merge conflict
added parents to contents
refactor categories
Merge pull request #79 from devstarter/contents

Contents