Merge pull request #80 from sh107/london_hackaton

Fix js conflicts in access control by group of the admin page
Use transmart-dev inline/repositories mechanism
Remove redudant xtrial domain classes
Fix http-builder dependency
Add fork settings for everything for war
Fix ExportService unit tests
Fix h2_init.sql (integration tests)
Fix PluginControllerTests
Fix FmFolderControllerTests
Fix FmFolderServiceTests
Merge pull request #81 from mirasrael/fix_http_builder_dependency

Fix http-builder dependency
Remove integration test on Rmodules controller

This was also a problematic test because it was using a unit test mixin
in an integration test and completely wrecking the metaclasses in the
process.
Update to recommended dep versions
Small test logging change
Fix remaining tests
Try to fix travis
Update logo images for new branding.
transmartApp needs to depend on -core-db-tests
Merge pull request #82 from transmart/fix_tests

Fix tests and auto-inline plugins
Re-committing 1.1 user manual changes