CRATEIT-94: Enables js to load on IE
Merge branch 'ie_test'
Merge branch 'master' of github.com:IntersectAustralia/owncloud
CRATEIT-72: finalising layout work, styling
CRATEIT-46: Adds create file feature context
CRATEIT-46: Adds create folder feature context
CRATEIT-46: Some work on clearing files before each scenario
Resolving differences
crateit-46 Added tests in add_to_crate feature
crateit-46 Fix duplicated methods from conflict resolution
Merge branch 'crateit-46' of github.com:IntersectAustralia/owncloud into crateit-46