Merge from master
Merge from master 2
Resolving CP error
Updated installation to reflect newly discovered

facts.
Merge branch 'Eclipse-Vaadin-project' of https://github.com/krajj7/pikater into Eclipse-Vaadin-project