Add new alias for test-only and test-quick with Tomcat7
Add simple test to check issue #136. Still need a more complex to test

Conflicts:

	project-code/integration-tests/src/test/scala/AllTests.scala
Raise margin duration for #136
Final test implementation for diagnose of #136
Update code for Scala 2.9