Merge pull request #3 from jordandukart/7.x

Solr, taxonomies and code style.
Merge pull request #4 from jordandukart/7.x

Cmodel and menu change (ONTIME-1164).
Merge pull request #5 from jordandukart/7.x

Update forms to remove extra button, css issues.