Fixed NullPointerException in getPriceScale
Merge branch 'master' of github.com:joejoyce/projectjuliet