Added support for blockout types other than simple.  Created new rest call that returns the blockouts in the form of a List<Job>
MONDRIAN-1464 - updating the mondrian schema for steelwheels.  The year_id column was incorrectly referenced as a String.
Merge pull request #270 from kurtwalker/master

MONDRIAN-1464
Merge pull request #269 from wseyler/dev

Added support for blockout types other than simple.  Created new rest ca...
BISERVER-8361 CommandLineProcessor should validate file-path before exporting
Merge pull request #272 from webdetails/master

BISERVER-8361 CommandLineProcessor should validate file-path before exporting
BISERVER-8101 - Added complex implementations of IBlockOutTrigger, while also handling them in the DefaultBlockOutManager implementation
BISERVER-8101 - Merge of recent conflicts with BlockOutTriggers
Merge pull request #273 from krivera-pentaho/dev

BISERVER-8101 -- Added changes to implementation of DefaultBlockoutManager to handle complex IBlockoutTriggers
BISERVER-8103: some cleanup
Merge pull request #274 from pentaho-skarmali/biserver-8103_blockout_ui

BISERVER-8103: some cleanup
[BISERVER-8039] Fixing instantiation, non longer using exception to control logic
ANALYZER - Change the territory colors from decimal representation to hex color since this is more intuituve for users.
BISERVER-8103: Updated URL path to add blockout periods. Still issues
Merge pull request #275 from pentaho-skarmali/biserver-8103_blockout_ui

BISERVER-8103: Updated URL path to add blockout periods. Still issues
[BISERVER-8315] Added hidden fields to transport the value of CustomListBox widgets. The internal/private "input" field of CustomListbox widgets cannot be used because these belong to the FocusPanel's private details, and do not even exist in IE.
[FIX] Avoid frequent and unnecessary JavaScript NRE errors, reported in the console, when evaluating "null" JSON results of "user-settings/list".
Fix for BISERVER-8359
In PUC, right-clicking on a non-selected folder and picking an item from
the context menu applies to the selected folder and not the folder where
the right-click occurred
Merge pull request #278 from e-cuellar/master

Fix for BISERVER-8359
BIServer 5499 create new server side PRPT import handler