added shortcodes/options and modified some CSS
added some shortcode stuff and smut
added icons from 1.1-pvac branch
bugfix for use of browser.msie deprecated property
update to twiter shortcode (untested)
(re)added scribd shortcode
added sanity check for events widget
fixed broken link to logo and a few js bugs
added module link shortcode
merges 1.1 and 1.2 shortcodes
added thumbnails to feeds
made news plugin selectable - need to finish doing the same for events
menu icons in top navbar and some minor changes to quotes
Merge branch '1.2'