Added the MainListViewActivity thus far
Continued work on MainListViewActivity, Created shells for some classes
to prevent errors.
Fixed some XML/resource errors. Errors in resources will prevent your R file
from being generated and eclipse will give strange errors!
Added some things to MainListViewActivity
Started fixing the search feature
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Picked up changes from master to continue working.
Conflicts:
	Team10ProjectW2014/bin/classes/ca/ualberta/team10projectw2014/R$drawable.class
	Team10ProjectW2014/bin/classes/ca/ualberta/team10projectw2014/R$id.class
	Team10ProjectW2014/bin/classes/ca/ualberta/team10projectw2014/R$layout.class
	Team10ProjectW2014/bin/classes/ca/ualberta/team10projectw2014/R$menu.class
	Team10ProjectW2014/bin/classes/ca/ualberta/team10projectw2014/R$string.class
	Team10ProjectW2014/bin/classes/ca/ualberta/team10projectw2014/R$style.class
	Team10ProjectW2014/res/values/strings.xml
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/MainListViewAdapter.java
Fixed pesky xml errors(which prevented R from being generated) and altered my activity to match Costa's work thus far.
Starting working with comparators for the sorting functionality and
added a shell for a compareTo method for LocationModel.
added NetworkConnectionController and implemented comparators for
comment location and time. Also changed the latitude and longitude
arguments for LocationModel to integers(though I'm unsure if this
is okay since i'm unsure of whether they were previosuly set as strings
for a reason)
Changed lat/lon in LocationModel to doubles as opposed to ints.
Added load and save method shells to UserDataController and moved
the sort preference booleans and their getters and setter to the
UserModel.
Add Favourite ActionButton and JavaDocs Comments
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole

Conflicts:
	Team10ProjectW2014/bin/AndroidManifest.xml
	Team10ProjectW2014/project.properties
	Team10ProjectW2014/res/values/strings.xml
Did work with radio buttons for sorting.
asdf
Merge branch 'david'
Worked on CC
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Merge from Master
Fix ActionBar Menu.