--  data-binding fix
Merge origin/master

Conflicts:
	mobilpiac-war/web/manage_phone.html