Merge branch 'hotfix/layout_fixes' into develop
Merge branch 'hotfix/rubyracerfixes' into develop
Merge branch 'hotfix/asset_issues' into develop
Compile assets client-side
Merge branch 'hotfix/asset_fixes' into develop
Merge branch 'develop' into feature/client_side_asset_compilation
Now with speedier client-side asset compilation!
Merge branch 'feature/client_side_asset_compilation' into develop
Merge branch 'hotfix/display_content_edit_panel' into develop
Merge branch 'programming_paneldisplay' into develop
Merge branch 'hotfix/fix_email' into develop
Merge branch 'hotfix/fix_content_email_template' into develop
Rails upgrade!
Merge branch 'develop'
Promoted Items Feature!
Merge branch 'develop'
Merge branch 'master' of github.com:lordmortis/Swancon-Rails