add Test Buttons to Settings
Merge branch 'master' of http://github.com/rustea1/a2b

Conflicts:
	v1/frontend/views/site/index_ios.php