Merge pull request #1 from jenterkin/master

cleanup
Merge pull request #3 from jenterkin/master

blerg
Merge pull request #2 from jenterkin/master

yep
Merge branch 'master' of https://github.com/WCC-LabTech/Faculty_Request
Merge branch 'master' of https://github.com/WCC-LabTech/Faculty_Request
Merge branch 'master' of https://github.com/WCC-LabTech/Faculty_Request
Merge pull request #3 from Jallal/master

 Fixe in the upload file
Minor changes to request returns
merged develop
Merge branch 'master' of https://github.com/Jallal/Faculty_request

Conflicts:
	faculty_request/admin.pyc
	faculty_request/models.pyc
	faculty_request/urls.pyc
	faculty_request/views.pyc
Merge branch 'master' of https://github.com/WCC-LabTech/Faculty_Request
minor changes
Merge pull request #4 from csalajan/master

Minor changes.