Add restrict flower count and add set nickname
Merge branch 'master' of https://github.com/mushanshitiancai/Yuan-Is-No-Say

Conflicts:
	AndroidManifest.xml
	src/com/yuan/yuanisnosay/ui/adpater/ConfessAdapter.java