[CLEANUP] - Added workspace to ignore list
[CLEANUP] - Update IntelliJ project and connect modules as dependencies
[BISERVER-11205],[PRD-4858] - PRPT importer did not handle the case where a one of description or title were not set.
Merge pull request #1359 from mdamour1976/5.0

[BISERVER-10884] Locale File is not updating the title for report in Pentaho User Console 5.0.2
[PDI-11048] - Updated the move/copy logic to fix rename issue in the DI server
Merge pull request #1361 from rmansoor/5.0

[PDI-11048] - Updated the move/copy logic to fix rename issue in the DI server
[BISERVER-10740] 4.8 to 5.x Migration Utility Breaks the 5.0 scheduler if a schedule exists with a colon in the name
Merge pull request #1364 from tkafalas/5.0-feature

[BISERVER-10740] 4.8 to 5.x Migration Utility Breaks the 5.0 scheduler i...
[PDI-10682] Backport: Fix race condition on getParameterMap, getInputStream, etc that causes POST parameters to be consumed prematurely.
Merge pull request #1368 from rfellows/5dev

[PDI-10682] Backport: Fix race condition on getParameterMap, getInputStr...
[SP-1208] - Update the getting started database to not use addition constructor argument.  This is an issue only in JBoss deployment
Merge pull request #1370 from rmansoor/5.0

[SP-1208] - Update the getting started database to not use addition constructor argument.
[SP-1178] - Backport of BISERVER-10957 - Manual deployment to JBoss 6.1.0 EAP (JBoss 7.2 AS Final) returns error on Login Page (5.0)
Merge pull request #1372 from brendan-lynch/sp-1178

[SP-1178] - Backport of BISERVER-10957 - Manual deployment to JBoss 6.1.0 EAP (JBoss 7.2 AS Final) returns error on Login Page (5.0)
Merge pull request #1357 from tmorgner/BISERVER-11205-5.0

[BISERVER-11205],[PRD-4858] - PRPT importer used happy-path coding for import
[BISERVER-10740] 4.8 to 5.x Migration Utility Breaks the 5.0 scheduler if a schedule exists with a colon in the name
Merge pull request #1385 from tkafalas/5.0-feature

[BISERVER-10740] 4.8 to 5.x Migration Utility Breaks the 5.0 scheduler i...
[IVY CHANGE] - resolving dependency for pentaho-reporting-engine
[BISERVER-11022] - Adding support for forcing db meta in SqlMetadataQueryExec via property

Conflicts:
	assembly/package-res/biserver/pentaho-solutions/system/pentaho-spring-beans.xml
	extensions/src/org/pentaho/platform/plugin/services/connections/metadata/sql/SqlMetadataQueryExec.java
Merge pull request #1386 from rmansoor/5.0

[IVY CHANGE] - resolving dependency for pentaho-reporting-engine