merge into one line
Revert "Update phone controlling"

This reverts commit 564bcb1198fe74eb46feb768c65c0304acee8a72.

Conflicts:
	public/js/controller.js