Merge branch 'master' into activities_checking

Conflicts:
	lib/main.js