RobinD42/Phoenix — pull request #28 by Metallicow (2014-01-06 08:18:01+00:00)
Title: Squash-library-branch updated master 2014

This PR is the library-branch after
git rebase Squash-library-branch
with the updated master.

I skip the pubsub stuff since it looks like oliver takes care of that stuff.
I hope this is the right one.