Got replies to pull but there is a delay
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/models/ApplicationStateModel.java