Time Update

Time Sorting and Private time variable.
Merge branch 'master' of https://github.com/akaplan33/SymphonyInteractive

Conflicts:
	AuthoringApp/src/src/Content.java
	AuthoringApp/src/src/TimePanel.java