Feature cleanup. Had many conflicts.

Damn you Features.
Merge branch 'develop' of github.com:OS2web/os2web_frontend into develop