bottom bar change!
Merge branch 'scottDev'
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/apply.html
Merge branch 'master' into scottDev
优化事件监听
Merge branch 'scottDev'
fix bug
Merge branch 'scottDev'
string to number
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
Merge branch 'scottDev'
fix type and order
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
Merge branch 'scottDev'