updating
Merge branch 'origin' of
https://github.com/jenkinsforsam/SamProjects2014.git into origin

Conflicts:
	src/test/java/com/qait/samproject/test/cases/BaseSuite/BaseTest.java