Merge pull request #1 from changyou/master

merge
Create README.md
Merge pull request #2 from changyou/master

pull changyou master
remove error testcase body
use firefox instead chrome in karma test (for travis ci
change db init compatibility with test
trigger travis
add readme and travis badge
Merge branch 'feature/fix_travis' of https://github.com/bitdewy/xocean into bitdewy-feature/fix_travis

Conflicts:
	README.md