added faculty to programs
added staff types and sidebar to filter types in staff_members view
corrected misspelled board_of_directors
merge conflict resolution with pages config file
empty commit
round 3 merge conflict resolution with pages config file
added normal to temp white list
added header and styling to staff edit form (css inline due to difficulty overriding admin stylesheet and should be refactored out eventually)
styling for program staff
added llincy role to staff_member
added margin-bottom to program roles row
added program role llincy migration
added latin_nyc to pages_controller
added refinery models
added quick fix for program_staff method
added classical architecture role
added classical_arch to be attr_accessible to staff_memeber model
added slug / staff match to controller
removed instructors from faculty heading
removed faculty from program view