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 pull request #142 from Orasi/staging-two

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

Conflicts:
	app/models/employee.rb
Merge pull request #143 from Orasi/staging-two

Staging two
Cleaned up mailers for test/dev
Change Ldap hashrockets to colons
Change ldap hashrocket to colons