score api is being added
merge for release
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest-desktop/.hnydsetting/.LOP
	DiamondTest/src/com/cnc/diamond/adapter/DiamondServerManager.java
	DiamondTest/src/com/cnc/diamond/components/Game.java
	DiamondTest/src/com/cnc/diamond/components/ResultPage.java
	DiamondTest/src/com/cnc/diamond/online/CharacterManagementApi.java
	facebook-android-sdk-3.5.2/facebook/bin/facebooksdk.jar
	server/app.js
	server/game.js
	server/node_modules/LOP_Node.js
	server/node_modules/Logic.js
	server/node_modules/ServerAdapter.js
	server/node_modules/ServerManager.js
	server/node_modules/Utils.js
	server/node_modules/linked_list.js