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

Conflicts:
	_gsdata_/_file_state_v4._gs
	_gsdata_/_insync_v4.gsl
	code/library.0.1.3.js
	style/colors.css