custom scroll options 2/2

Change-Id: I42d14a97886c2e08f07df2ea3fa81bcf850249e1
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/values/attrs.xml
	res/values/bs_strings.xml
	res/xml/general_settings.xml