Merge pull request #2 from dmakhno4gd/demoTests

Demo tests
defining the 'phase' and 'precedingPhases' fields in a new way
Merge pull request #3 from storgashov/new-phases

[FEATURE] Defining the 'phase' and 'precedingPhases' fields in a new way
Update manifest
Update manifest.yml
changes to map static content both in tomcat6 before and after version 6.0.30
Merge pull request #1 from jastakhova/for-tomcat6.0.35

changes to map static content both in tomcat6 before and after version 6...
Merge pull request #5 from jastakhova/master

Fix for tomcat 6.0.35 (ubuntu 11, 12)
Grouping manifests, integration testing