Merge branch 'master' of https://github.com/mkni1408/PowerViz

Conflicts:
	PowerVizApp/Source/BarScreen.hx
changes to barscreen
Merge branch 'master' of https://github.com/mkni1408/PowerViz