2014.5.24
2014.5.24
Merge branch 'master' of https://github.com/GuoSongHao/Api

Conflicts:
	Styles/reset-min.css