port forward app sidebar from chameleon

Change-Id: I2bb02e9f955e11376743516822bfcd018937d732
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/values/cr_strings.xml
	res/xml/beanstalk_interface_settings.xml

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/general_settings.xml