merge
Merge branch 'master' of https://github.com/MKBid/MKBid-API.git

Conflicts:
	settings/routes.php