move datastore-indexes-auto.xml to datastore-indexes.xml
Merge branch 'master' into container-ruixue

Conflicts:
	war/WEB-INF/datastore-indexes.xml
demo page change: firstName,lastName,nickName
code modification
Merge remote-tracking branch 'origin/developer-lisa'
modify
demo change
socialAuth
modification
login page prototype

Signed-off-by: owwlo <owwlo@163.com>
sign up page
page style change
small change to login-page

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'login-page' of https://github.com/lisajluo/smg-server into login-page
theme change for login

Signed-off-by: owwlo <owwlo@163.com>
front-End
Merge branch 'huan-login' of https://github.com/lisajluo/smg-server into huan-login
small change from xuejie

Signed-off-by: owwlo <owwlo@163.com>
main page ui

Signed-off-by: fei <1450622282@qq.com>
Merge branch 'login-page' of https://github.com/lisajluo/smg-server