Merge branch 'hotfix/fix_content_email_template'
null check on panel description
Merge branch 'master' of github.com:lordmortis/Swancon-Rails
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:lordmortis/Swancon-Rails
woo. New what's new style.