f/#187 Completed
Merge branch 'master' of github.com:ami-lab/AmI-Platform into f/#187-API-endpoint-for-retrieving-properties-of-a-sid-t-pair
Merge branch 'master' into f/#187-API-endpoint-for-retrieving-properties-of-a-sid-t-pair

Conflicts:
	api/api.py
	test/api/test_api.py
Merge pull request #218 from ami-lab/f/#187-API-endpoint-for-retrieving-properties-of-a-sid-t-pair

F/#187 api endpoint for retrieving properties of a sid t pair