changed styles
Merge commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/dailog_rule.xml
	res/values/strings.xml
	src/com/example/ringcon/MainActivity.java
	src/com/example/ringcon/OnRuleRefreshListener.java