Criterial commit

Criterial commit
Conflict

Conflicts:
	sites/all/modules/user_extend/user_extend.module