Improved Shared Preference
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	app/src/main/java/com/example/xzbkcc/bullseye1/TermCond.java
1003 - 21:14
1003 - 21:14