premerge commit
Merge branch 'master' of https://github.com/mbdietrich/PowerRings
Fixed inner radius scaling
Merge branch 'master' of https://github.com/mbdietrich/PowerRings
Simplified data representation on UI
Resolved conflict