Update to barChart service
Update to controller
Merge branch 'master' of https://github.com/grabbeh/gwr
Added filter by expiry year search