confs
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/wPageObject/wAccountPage.class
	src/wPageObject/wAccountPage.java