0.3.1
Merge branch 'master' into bs-browserstack

Conflicts:
	package.json
Refine the browser test list.