Develop

Added Resources page, models, etc, and fixed merge conflicts and other problems with the Announcement model/view.