Merge branch 'refs/heads/master' into Eric
Profile and ride expire
Changes to EditRide and ViewRide

Signed-off-by: Eric Poirier <eric@ericpoirier.ca>
notifications
minor
del
Changes to Create rides

Signed-off-by: Eric Poirier <eric@ericpoirier.ca>
Merge branch 'refs/heads/Pete' into Eric

Signed-off-by: Eric Poirier <eric@ericpoirier.ca>

Conflicts:
	application/views/profile/viewRide.php
Merge branch 'refs/heads/Eric'