Merge origin/juanc into sheng

Conflicts:
	backend/Danta/DantaRest/src/main/java/pixelated/dantagae/controller/SEASController.java