More serial stuff

wtf
Merge branch 'master' of https://github.com/akaplan33/SymphonyInteractive

Conflicts:
	AuthoringApp/src/src/Content.java