Fix issue #31

Added possibility to distinguish between container and container-fluid
revert container plugins
Merge remote-tracking branch 'upstream/0.4.0' into develop