Removed IBM logo
Added X-header field to support file uploads for the PHP proxy
Removed IBM logo
Fix compilation error on jsp

Fix compilation error on jsp
Code cleanup

Code cleanup
Use TestEnvironment instead of loading properties on tests

Use TestEnvironment instead of loading properties on tests
Sample updates
Merge pull request #1525 from benjamij/file-grid-change

Widget updates
Method to return the serviceMappingKeys

Method to return the serviceMappingKeys
Revert "Method to return the serviceMappingKeys"

This reverts commit a9aea9b13af4a2c98beda30b52ee50d8c4c14eb4.
Updated settings and samples to correspond to Moodle block
Merge pull request #1526 from benjamij/wordpress-update-201405

Wordpress update
Merge remote-tracking branch 'origin/2.0.0-alpha' into java-fix-tests-and-cleanup
More ActivityService unit test fixes
Merge pull request #1528 from markewallace/BugFixesTake4

Bug fixes take4
Fixes in tests for Connections 5

Fixes in tests for Connections 5
Fix in WikiService
Fix in BookmarkService
Fix in Version.isAtLeast (was inversed)
Merge remote-tracking branch 'origin/2.0.0-alpha' into java-fix-tests-and-cleanup
Fix new implementation of URLPattern

Fix new implementation of URLPattern:
- Clean double slashes (//) to single (/)
- Detect unreplaced placeholders and throw a missing parameter exception
- Change ActivityStreamURLs so that @ are already encoded to %40
Improve URLPattern

Improve URLPattern
Cleanup URLPattern

Cleanup URLPattern