Added Calabash tests for email input screen and updated old tests.
Resolved merge conflicts.