ticket 13 and 14
Merge branch 'master' of github.com:nathanrharris/MyNGL

social-area.tpl.php conflict
ticket 12