Merge branches 'feature-orm' and 'passport' of github.com:bem/bem-forum into feature-orm

Conflicts:
	server/github.js
	server/services/orm.js
Merge remote-tracking branch 'origin/feature-orm' into feature-orm

Conflicts:
	server/forum.js