Significant PHPDoc enhancements
PHPDoc
Merge branch 'master' of https://github.com/nathanbuchar/nbb

Conflicts:
	app/config/app.php