* 1.3: (27 commits)
  updated docs
  deprecated the user() trait
  made it easier to get the user from the app
  updated the changelog
  Remove incorrect examples and fix grammar
  updated changelog and docs
  Fixed whitespace issue
  Add options request capability to controller collection
  Update Application add options method for handling option routing
  Basic documentation
  Use PHPUnit annotation to skip test on <5.4
  Document as mixed, may be a string intended to be resolved from the CallbackResolver
  Revert the CS fix and make a valid docComment
  More CS fixes
  CS Fixes
  Allow view listeners to be "skipped" by returning null
  Restricted visibility
  Fix docblock type
  Remove callable hint for 5.3 tests
  Avoid mutating state
  ...

Conflicts:
	src/Silex/Application.php
	src/Silex/Provider/SecurityServiceProvider.php
	tests/Silex/Tests/ApplicationTest.php