Rudimentary support for subpages added.
Improvements.
Association hirarchy added.
Merge with develop branch.