no message
Merge branch 'mobile-develop' into Notification

Conflicts:
	wp-content/themes/twentytwelve/xoomaapp/scripts/Cordova/app-notifications.js
	wp-content/themes/twentytwelve/xoomaapp/scripts/app.js
	wp-content/themes/twentytwelve/xoomaapp/scripts/common/common.js
	wp-content/themes/twentytwelve/xoomaapp/scripts/products/add/add.products.ctrl.js
	wp-content/themes/twentytwelve/xoomaapp/scripts/profile/measurements.ctrl.js
	wp-content/themes/twentytwelve/xoomaapp/scripts/profile/personalinfo.ctrl.js
	wp-content/themes/twentytwelve/xoomaapp/scripts/profile/profile.ctrl.js
no message
no message
New Code Pulled
no message
Merge branch 'Notification' into mobile-develop