Push & notifications fixes. Wizard improvements
Merge pull request #93 from maxirosson/dev

Push & notifications fixes. Wizard improvements