Version 1.2 beta1
Merge branch '1.2' of https://github.com/mruz/base-app.git into 1.2