Merging data-sync-rebirth-roadmap

This is basically the state of https://github.com/aerogear/aerogear.org/pull/397 + merge to master.

There were some conflicts that are handled in additional merge commit at the end.

Should I squash those commits?

@danbev could you please review whether my last commit resolves merge conflicts correctly?