Merge branch 'huan-v5' of https://github.com/lisajluo/smg-server into container-move-2
login modification

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'master' of https://github.com/lisajluo/smg-server into container-move-2
add java doc and modify tests
error draft
document added

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'container-move-2' into container-ruixue
full request url

Signed-off-by: owwlo <owwlo@163.com>
add return details - part 1
Merge branch 'container-move-2' into container-ruixue
return value details added.
MOS error details

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'container-move-2' into container-ruixue
player: javadoc and error msg
Merge branch 'master' of https://github.com/lisajluo/smg-server into jinxuanwu-friend
friend list: javadoc and error msg
javac doc huan
Test Cases for AngularDeveloperPagesServerApiTest

Added test cases for the Angular JS developer page.
Built based on existing server tests.
Run AngularDeveloperPagesServerApiTest.html in browser
Qunit will run tests.

J. Sutton
5/10/14
11:18 PM
database java doc
Merge remote-tracking branch 'origin/jinxuanwu-friend'