Changed versioning rules.
Merge develop V-1.1.0
Fixed a bug in the view module and removed a file.
Merge branch 'master' into develop