server changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	alexaNewCode/serverClasses.py
server changes