commit
Merge branch 'develop' of https://github.com/tckeelin/RideShare into 637_RepeatingSchedule_Henry
Added distance calculator
Merge branch 'develop' of https://github.com/tckeelin/RideShare into 637_RepeatingSchedule_Henry
commit repeating schedule
Merge pull request #23 from tckeelin/637_RepeatingSchedule_Henry

637 repeating schedule henry
updated .gitignore
Work on nav drawer
build/deps fix
google-play-services
building project w/ ant
update to develop
build updates
build updates
update
commit 2 2/26/14
 Please enter the commit message for your changes. Lines starting
Merge remote-tracking branch 'origin/develop' into 667_ActionBarLayout
ActionbarLayout merge 2/26/14
Conflicts:
	clients/Android/RideShare/.classpath
	clients/Android/RideShare/AndroidManifest.xml
	clients/Android/RideShare/gen/com/asu/rideshare/Manifest.java
	clients/Android/RideShare/gen/com/asu/rideshare/R.java
	clients/Android/RideShare/gen/com/google/android/gms/R.java
	clients/Android/RideShare/res/layout/activity_home.xml
	clients/Android/RideShareTests/.classpath
	services/EndpointService/.classpath
	services/NotificationService/.classpath
	services/utils/DataManager/.classpath
Merge pull request #24 from tckeelin/667_ActionBarLayout

667 action bar layout
Merge branch 'develop' of https://github.com/tckeelin/RideShare into develop
fixing develop from bad merge