22

22
Merge remote-tracking branch 'origin/nmaster' into nmaster

Conflicts:
	Driver/bin/classes/ustc/sse/water/activity/R$string.class
	Driver/bin/classes/ustc/sse/water/activity/R$style.class
	Driver/gen/ustc/sse/water/activity/R.java