-Almost finished with the new parser - must finish hooking it up into validating and vis.
Don't try to send to blank email address.
Test creating user with no email.
Merge branch 'master' of https://github.com/isenseDev/rSENSE into password-resets

Conflicts:
	app/controllers/users_controller.rb
Revert "Revert "Clean up email address validation.""

This reverts commit 9390899cc49819b5401ebd99b28509174c23b4b6.
Revert "Revert "Add password reset functionality.""

This reverts commit 1eae7f7d6eea5c3b01938f3d9bb313e583d37706.
Revert "Revert "Make email message better.""

This reverts commit 0a1fe5915259fcab3de42a74a8c32492f83db3f7.
Revert "Revert "Allow user email changes.""

This reverts commit 990fa0567b693e454da35847bcd5dd19e58b618b.
Merge branch 'password-resets' of github.com:NatTuck/rSENSE into password-resets

Conflicts:
	app/controllers/users_controller.rb
-Finished integrating the new date parser. Works with validation as well.
Reordeed symbols and increased size of diamond
Merge remote-tracking branch 'upstream/master' into jp728
Merge remote-tracking branch 'upstream/master' into jpTemp
Error message for taken email.
Merge pull request #871 from NatTuck/password-resets

Password resets with less failed validation emails
-Added check to user#update to correctly process change of email requests.
Merge pull request #877 from mmcguinn/mm23

-Added check to user#update to correctly process change of email request...
Merge pull request #872 from mmcguinn/mm842

New Date Parser
-Fixed null dates displaying as "Invalid Date".
-Fixed null and invalid dates being part of the line connection on map.
Merge remote-tracking branch 'upstream/master' into jpTemp