comit
Merge branch 'master' of github.com:xupeilong/InternetRuntimev2

Conflicts:
	InternetRT/app/org/internetrt/Modules.scala
Merge branch 'master' of github.com:xupeilong/InternetRuntimev2
Merge branch 'master' of github.com:xupeilong/InternetRuntimev2
Merge branch 'master' of github.com:xupeilong/InternetRuntimev2
bugs