changes to photo serving url and merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mobile Application Backend/src/APIs/User.py