working on
Merge branch 'master' of https://github.com/tearsofphoenix/CarPooling

Conflicts:
	Client/Web/Carpooling/platforms/ios/www/js/foundation.js