More IAP stuff

* Fix SecurityException on launch
* Show price on upgrade button
Merge branch 'origin/master'