update
Merge branch 'master' of https://github.com/epha/matrix

Conflicts:
	code/matrix.js