v 0.9.0.6

merge inline/displays content-elements files into a single file.

update rules of some of the classes to be a bit more useful / less breaky.

update import/master vars