a
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/starbaby_03/share/author.java