Merge branch 'master' of github.com:MorehouseJ09/prospero
Update merged (safely)
Update htaccess from before
Update navigation
Update sample dump for local changes
Pull down live changes
Update property_filter and fix elements as needed
Update element
Update navigation