User excluded in tpl
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/users.tpl
update
Users paging with ajax
Merge remote-tracking branch 'origin/master'