Issue 8273 by sgl: Prepare to 7.x
Issue #8273 by cableman: Updated coding style to match drupal 7
Issue #8273 by cableman: Updated module code to match ding2
Issue #8273 by cableman: Fixed errors in form generation
Merge branch 'development'