Parameterize Selenium options to command-line; merge Java files
Merge branch 'master' of github.com:tis-innovation-park/tm-examples

Conflicts:
	eGov/ant-testng-selenium/src/eu/testingmachine/TestAndroidAbendschulen.java