ref #0006 try to passport integration
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/RestController.coffee