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
Image upload/download, Player fixes
Merge remote-tracking branch 'origin/developer-lisa'