Code changes for running on iPhone
Merge commit '80c649774b359751666467066399f8e1ecbfa3c3'

Conflicts:
	propinquity/www/js/controllers.js