Fix org.has_parent? method
Make faculty field for cru only
Hide faculty in profile if org is not under cru
Tell staging to use memcached server listed in memcached.yml
Fix conflicts