Merge pull request #1 from storgashov/master

fixing manifest to accommodate new expression parsing rules
Added sbt template
navigation tests
added default timeout
fixup
Merge pull request #2 from dmakhno4gd/demoTests

Demo tests