test
Merge branch 'master' of https://github.com/johntbush/sakai-test-suite

Conflicts:
	.cache
	.gitignore
	README.md
	pom.xml
	src/test/resources/com/anisakai/test/cucumber/AdminUsersToolTest.feature
	src/test/resources/com/anisakai/test/cucumber/LoginTest.feature
	src/test/resources/com/anisakai/test/cucumber/SiteCreation.feature
	src/test/scala/com/anisakai/test/Config.scala
	src/test/scala/com/anisakai/test/PhantomJSDriverObject.scala
	src/test/scala/com/anisakai/test/cucumber/RunCukesTest.scala
	src/test/scala/com/anisakai/test/cucumber/stepdefs/LoginTest.scala
	src/test/scala/com/anisakai/test/cucumber/stepdefs/SiteCreationTest.scala
	src/test/scala/com/anisakai/test/cucumber/stepdefs/UsersToolTest.scala
	src/test/scala/com/anisakai/test/cucumber/stepdefs/package.scala
	src/test/scala/com/anisakai/test/pageobjects/Page.scala
	src/test/scala/com/anisakai/test/pageobjects/Portal.scala
	src/test/scala/com/anisakai/test/pageobjects/SiteManageTool.scala
	src/test/scala/com/anisakai/test/pageobjects/UsersTool.scala
commit
Merge pull request #1 from garethleonard/master

Tools Testing Script Update