Merge pull request #3 from structr/master

Merge pull request #303 from vigorouscoding/master
fix for the types-view
Merge branch 'master' of https://github.com/vigorouscoding/structr
Merge pull request #304 from vigorouscoding/master

fix for the types-view