PoS is pulled every time from API
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/database.py