1
Merge branch 'master' of https://github.com/flaviox/slimfw

Conflicts:
	vendor/autoload.php
	vendor/composer/autoload_real.php
	vendor/twbs/bootstrap