Less downtime during asset precompilation on deploy.
Merge branch 'next'
Merge branch 'next'
Merge branch 'next'
Merge branch 'next'
Merge branch 'next'
Merge branch 'next'
Merge branch 'next'
Merging fix and test for deleting a media resource

Merge branch 'next'
Merge branch 'next'
Merge branch 'next'
Merge branch 'next'
Remove that junk.
Merge branch 'next'
New version of active_admin
Conflict resolution.
Included app_admin assets to precompilation
More correct git log output.
More correct git log output.
Merge branch 'next' of github.com:zhdk/madek into next