post and faculty model and controller changes
Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	app/models/faculty.js
Merge branch 'origin/TM2-SP'
Merge branch 'origin/master'
Merge branch 'origin/TM2-SP'
Merge branch 'origin/TM1-SA'