7.x 1.x dev

* Merged dev code with local
* cleaned up features
* removed og dependencies from features