Client and server update
Merge branch 'master' of https://github.com/TeamRobin/FinanceAPI