Feature cleanup. Had many conflicts.

Damn you Features.
Merge branch 'develop' of github.com:OS2web/os2web_frontend into develop
Add missing field_group file from last update.
Revert "Correct use of jQuery."

This reverts commit e1fe0852a887dda7922a11de6e1fa02dd08d7546.
Merge branch 'develop' into release-1.0.1
Merge branch 'release-1.0.1'