Eswar - 15/02/2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/resources/cucumber/examples/java/account/google.feature
Eswar - 15/02/2014
(cherry picked from commit a273f10)
Eswar - 18/02/2014
(cherry picked from commit a273f10)