fixed merge issues and added signin default behavior when user hits enter in the signin/signup form