fixed #225
fixed #223
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	app/views/project/projectShareRow.xml