add null check
Merge pull request #854 from dennishendriksen/master

Big fux: add null check
Update spring 3.2.3 to 3.2.4, spring security 3.2.0-RC1 to 3.2.0-RC2, spring data commons core 1.4.1 to 1.6.2
define spring versions in parent pom, update sql java connector
mysql connector version property
Merge pull request #856 from dennishendriksen/master

Library updates
Merge branch 'master' of https://github.com/molgenis/molgenis into
genomebrowser

Conflicts:
	molgenis-app-omx/src/main/java/org/molgenis/omx/MolgenisWebAppSecurityConfig.java
	molgenis-omx-protocolviewer/src/main/java/org/molgenis/study/StudyDefinitionMeta.java