Fixed location list
null
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
fixed location list problem
Added map functionality with button in SCVA action bar
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
fixed location list dislay lag
Fixed assorted comment view activity so that unfavouriting from within is okay, and numerous assorted comment view activities can be open at once since they do not rely on the same title from applicationstatemodel but use intents to get their titles instead,
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Finished mapping functionality
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Tweaked map default focus
Moved sort by picture from CommentModel to ApplicationStateModel
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
fixing SCVA to display comments
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/controllersAndViews/SubCommentViewActivity.java
I can
I didn't even realize I made any changes...
fixed SCVA no sorting tho
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/controllersAndViews/SubCommentViewActivity.java