BISERVER-8336 Import/Export locale fixes
Merge pull request #350 from tkafalas/feature

BISERVER-8336 Import/Export locale fixes
Merge pull request #351 from wseyler/dev

BISERVER-8817: Fixed problem where run once and final runs of a blockout...
Fix for BISERVER-8709 Update Users and Roles panel
Merge pull request #352 from e-cuellar/master

Fix for BISERVER-8709
[BISERVER-8627] Adding flyout for "new" button, i18n for all strings. Introducing handlebars for templating. Ensuring browser perspective is active when executing OpenFileCommand
Adding some comments
User Roles panel refactoring to minimize server calls and bug fixes.
Merge pull request #353 from e-cuellar/master

User Roles panel refactoring to minimize server calls and bug fixes.
[BISERVER-8336] Skip writing locale files when skipping content due to
overwrite flag = false.  Fix hidden when importing from filesystem zip
Merge pull request #354 from tkafalas/feature

[BISERVER-8336] Skip writing locale files when skipping content due to
Update PluginThemeResolver.java

[BISERVER-8172] - ConcurrentModificationExceptions in PluginThemeResolver.
Nothing like some good imports to save the day.
Cleansing old ABS panel and code.
Merge pull request #355 from e-cuellar/master

Cleansing old ABS panel and code.
BISERVER-8832 Clicking on an already selected perspective causes strange
behavior in PUC
[BISERVER-8746] -- Added functionality for duration with blockouts as well as switching blockouts to use long for duration
Merge pull request #356 from krivera-pentaho/dev

[BISERVER-8746] -- Added functionality for duration with blockouts as we...
BISERVER-4248 DBCP BasicDataSource configuration doesn't have pool options set - MySQL timeouts will result

In trunk, changes to the applicationContext-*hibernate* and *jdbc* will result in mysql timeouts after the connection gets stale.

1- Settings need to be added that include the connection check query - for mysql, this should be set to "/* ping */select 1". For others, see the connection check queries in the hibernate files.

2- The settings also should include minimum/maximum idle, maximum connections, etc. For this login stuff, I'm going to suggest a minimum idle of 0, and a max idle of 4. Other pool settings should be in there too.
Merge pull request #357 from webdetails/master

BISERVER-4248 DBCP BasicDataSource configuration doesn't have pool options set - MySQL timeouts will result