Merge pull request #64 from richard-willowit/version70

Merge ictstudio changes, with adjustments.
Remove "Pentaho Reports" as a menu option in its own right.

Combine with OpenERP reports views.

Allows Reports to be switched from one type to the other.

Closes #41