updated API_Test.py to a function that takes the query as input
Merge branch 'master' of https://github.com/MetisSoftware/WealthManagementTool

Conflicts:
	Server/API_Test.py