commit
merged master to newView
Merge pull request #27 from etrom/features/newViews

Features/new views