print styles:  hid masquerade block
People Views feature
Merge branch 'master' of github.com:ITS-UofIowa/hr.uiowa.edu
Remove old transportation stuff
HR People Views - 7.x-1.1 - sort: alpha last, first
Merge branch 'master' of github.com:ITS-UofIowa/hr.uiowa.edu
HR Employee Discount Taxonomy - 7.x-1.0
Contrib: autocomplete_deluxe
HR Employee Discount Entity
Updated dependancies
Contrib: Term Reference Tree Widget
HR FAQ Entity - 7.x-1.0
HR Employee Discount Feeds CSV Importer - 7.x-1.0
HR Employee Discount View - 7.x-1.0
Added entity as a dependancy
Merge remote-tracking branch 'origin/master' into test

Conflicts:
	modules/features/hr_people_views/hr_people_views.info
	modules/features/hr_people_views/hr_people_views.views_default.inc
	themes/hr/css/print.css