Merge branch 'delrifai/#394_add_charts_to_balance_history' into delrifai/#394_2_add_charts_to_balance_history