Show missing template name.
Add keyword searching to Files module in Admin controller
Update global_lang.php
Merge branch 'feature-search-keyword' of git://github.com/pickupman/pyrocms into 2.2/develop
Fixed issue with search result not being highlighted in Files
Merge pull request #2684 from bsh/patch-2

Update global_lang.php
Merge pull request #2672 from bsh/patch-1

Show missing template name in title.
Switched file library to initialize separate from class load. It has been
this way I think... must have been reverted. Fixes #2668
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Removes the requirement to add cellspacing="0"

Cross-browser solution to remove the need for cellspacing="0" cellpadding.. on tables
Merge pull request #2685 from ryun/patch-5

Removes the requirement to add cellspacing="0"