Fixes #140
Fixes issue with LDAP (case sensitivity issue)
Merge branch 'staging' of github.com:Orasi/blue-source into staging
Initial modal and filtering work.
Added sort functionality to calendar reporting
Removed annoying bug that would bring you back to the top of the page in the calendar when expanding
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'staging' of https://github.com/Orasi/blue-source into staging
Add email as valid login
Merge pull request #142 from Orasi/staging-two

Add email as valid login
Merge branch 'calendar-reporting' into staging

Conflicts:
	app/models/employee.rb
Change email validation to regex
Add email regex for method validate
Fix the username logging in with Uppercase letters
Merge pull request #143 from Orasi/staging-two

Staging two
Add pending color to calendar legend
Cleaned up mailers for test/dev
Change Ldap hashrockets to colons
Change ldap hashrocket to colons