Update dependencies
Merge branch 'master' of github.com:hhaidar/flexical-2

Conflicts:
	package.json