Version should be 2.6.0-SNAPSHOT on master
Merge branch 'master' of github.com:raptorjs/raptorjs

Conflicts:
	package.json
Merge branch 'master' of github.com:raptorjs/raptorjs

Conflicts:
	package.json