Changed spring dependency to version 4.0.0 (due to java 8 compatibility)
Merge branch 'master' into lr621_upgrade
Updated dependencies to work with Java 8
Merge branch 'master' into lr621_upgrade
Updated pom to work with Java 7 again
Merge branch 'master' into lr621_upgrade
Merge branch 'lr621_upgrade'