Added forms structure
Merge branch 'master' into develop
Some views
Added views