Merge branch 'mobile-develop' into MeasurementAndProfile
no message
New code pulled
no message
Merge branch 'MeasurementAndProfile' into mobile-develop

Conflicts:
	wp-content/themes/twentytwelve/xoomaapp/scripts/common/common.js
	wp-content/themes/twentytwelve/xoomaapp/scripts/measurements/MeasurementView.js
	wp-content/themes/twentytwelve/xoomaapp/scripts/measurements/profileMeasurementCtrl.js
	wp-content/themes/twentytwelve/xoomaapp/scripts/xooma/xooma.app.root.ctrl.js
no message
Merge branch 'mobile-develop' of https://github.com/ajency/xooma-track-go into mobile-develop

Conflicts:
	wp-content/themes/twentytwelve/xoomaapp/scripts/profile/ProfilePersonalInfoCtrl.js
	wp-content/themes/twentytwelve/xoomaapp/scripts/profile/ProfilePersonalInfoView.js