fix derp
Add an option/category in Dev Set to customize the device hostname (2/2).

PS2:
- cleanup

Change-Id: Iee14e90fa6fb6a13a123d92b7cf6dceaf6d18ffc

Conflicts:
	res/values/disco_strings.xml
 Autor:    MURA Stefano <ssspinni@gmail.com>
Show application's package name in the "App info" screen.

Change-Id: I7dac8ffa0b10abb5ff235750e90a96d801b2f919
Merge branch 'lollipop' of https://github.com/disco2/packages_apps_Settings into lollipop