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

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/models/ApplicationStateModel.java
Fix picture display in MLVA and SCVA
Merge changes with master
Fix merge for image display
Adding sort by user location
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole