Pull from git update
Merge branch 'dashboard_LA_jQuery' of github.com:hawkwynd/vandyapp into dashboard_LA_jQuery

Conflicts:
	public_html/scripts/uploader.js