updating bootstrap.php
Merge branch 'master' of github.com:ecabrerar/webapp-base

Conflicts:
	library/bootstrap.php