Merge remote-tracking branch 'mark/addsorts' into stravant-addsorts.
Also fixed comment mentioned in PR

Conflicts:
	moqa/src/com/ualberta/team17/view/ListFragment.java