CRATEIT-72: changes to layout to match mockups
Merge branch 'master' of github.com:IntersectAustralia/owncloud
Hack to remove the js popup alert that's failing behat tests
CRATEIT-49 Added Behat test for default crate feature
Fixing jenkins by including the Behat and Mink install, as well as selenium scripts
Add back in phpunit
Resolving differences
CRATEIT-46: Adds create folder feature context
CRATEIT-46: Some work on clearing files before each scenario
crateit-46 Added tests in add_to_crate feature
crateit-46 resolve conflicts