Merge pull request #753 from bhariharan/unstable

Upgrade steps for 3.0.0
Lollipop requires explicit intents