jqury 远程加载
Merge remote-tracking branch 'origin/DEV-LWJ'
local loading jqury
Merge remote-tracking branch 'origin/DEV-LWJ'
Merge remote-tracking branch 'origin/DEV-LWJ'
Merge remote-tracking branch 'origin/DEV-LWJ'
将post的返回信息改为中文
Merge remote-tracking branch 'origin/DEV-LWJ'

Conflicts:
	LivePPT/app/controllers/UserAction.java
	LivePPT/app/views/index.scala.html
Merge remote-tracking branch 'origin/DEV-LWJ'
add sql evolution
Merge remote-tracking branch 'origin/DEV-LWJ'

Conflicts:
	LivePPT/app/controllers/UserAction.java
Merge remote-tracking branch 'origin/DEV-LWJ'
Merge remote-tracking branch 'origin/DEV-LWJ'

Conflicts:
	LivePPT/conf/evolutions/default/1.sql
Merge remote-tracking branch 'origin/DEV-LWJ'
Merge remote-tracking branch 'origin/DEV-LWJ'
Add ignoreList
add lib
Merge branch 'master' of https://github.com/FeverTeam/LivePPT-JavaPlay

Conflicts:
	LivePPT/.gitignore
Merge remote-tracking branch 'origin/DEV-LWJ'
Merge remote-tracking branch 'origin/DEV-LWJ'