Fixed missing quote of generators/controller.blade
Added branch-alias to username-optional 

as being 4.1-dev
Added branch-alias to username-optional as being 4.1-dev
Merge branch 'master' of github.com:Zizaco/confide

Conflicts:
	composer.json
fix parseIdentity not returning when not an array
fix soft delete getUserByIdentity