Removed conflicts in the push by Abhishek.
Fixed signup page HTML markup.
Conflicts. Aargh.