Everything except sage birds
Merge branch 'master' of https://github.com/oscin-es/oscin-es.github.com