Merge pull request #3 from bitdewy/master

Fix travis bug
add grunt test
change e2etest browser
update gruntfile
Fix travis error
temp
test
Merge branch 'feature/seajs' into develop

Conflicts:
	scripts/server.coffee
Revert "test"

This reverts commit 7c88fad5793feedb0f139311e58d6b3399248231.
temp
update index
fix travis
Merge pull request #6 from bitdewy/develop

merge dev to master