sorted chart math
refactored templete
refactored chart percentage math to templete.php
Merge pull request #306 from Webcraft-Myplanet/uf-462

Uf 462
small typo fix
merged develop into branch and fixed conflicts