Merge branches 'master' and 'dev' into dev
[BISERVER-8596] fix for empty .properties files that are not locale
enabled
Merge pull request #181 from rmansoor/master

 	BISERVER-8593 - Adding some ui changes to user console related to hidden files
Merge pull request #180 from pentaho-tband/dev

[BISERVER-8596] re-read inputstream for locale file check
Fixed compilation error and removed unnecessary import statement.
Merge pull request #182 from e-cuellar/master

Fixed compilation error and removed unnecessary import statement.
Update REST services and SimpleBlockoutTrigger to fix serialization issues and to all persistence of duration
Merge pull request #183 from wseyler/dev

Update REST services and SimpleBlockoutTrigger to fix serialization issu...
[BISERVER-8337] Move title/description localization logic from RepositoryFileAdapter to JcrRepositoryFileUtils.
BISERVER-8504 - Added filter based on the extra roles defined
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8566
Merge pull request #184 from bytekast/master

[BISERVER-8337] Move title/description localization logic from RepostoryFileAdapter to JcrRepositoryFileUtils
Merge branch 'master' of https://github.com/pentaho/pentaho-platform into BISERVER-8566
BISERVER-8101 - Updated DefaultBlockoutManager to handle DateIntervalTrigger and NthIncludedDayTrigger
Merge pull request #185 from webdetails/BISERVER-8504

BISERVER-8504 - Added filter based on the extra roles defined
Merge pull request #186 from krivera-pentaho/dev

BISERVER-8101 - Updated DefaultBlockoutManager to handle DateIntervalTrigger and NthIncludedDayTrigger
Fix JUnit Tests
Merge pull request #187 from bytekast/master

Fix JUnit Tests
[BISERVER-8609] - Add fallback mechanism when retrieving localized title/description
[BISERVER-8337] - No longer need to load localizationMap when getChildren is invoked. The client can utilize the REST service instead.
Localizing XAction content and properties.