Access-Control-Allow-Origin && Access-Control-Allow-Methods
Merge branch 'master' of github.com:dpordomingo/level3-silex

Conflicts:
	src/Level3/Silex/Controller.php