directory UI beta, tempforms.html added
Merge remote-tracking branch 'origin/master'

Conflicts:
	AlumniPortal/AlumniPortal/urls.py
directory UI beta, tempforms.html added