syyync
Merge remote-tracking branch 'origin/master'

Conflicts:
	_Base.html
	static/js/getData.js