Add Add authentication panel to lifelines app
UI hide all screens except for Catalogue, Dataviewer, Login
fix merge
using theirs
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #186 from ChaoPang/master

Fixed apostrophe bug in MolgenisXrefService
Setting a Runtime variable for viewing/hiding the View button in the protocol Viewer. Added control in ftl file. This produces a problem in the test; molgenis-omx-protocolviewer/src/main/resources/templates/org/molgenis/omx/plugins/ProtocolViewer.ftl because the application is not run when the test runs and teh ApplicationContextProvider is null
made some small improvements on the example dataset
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-protocolviewer/src/main/java/org/molgenis/omx/plugins/ProtocolViewer.java
	molgenis-omx-protocolviewer/src/main/resources/templates/org/molgenis/omx/plugins/ProtocolViewer.ftl
Setting a Runtime variable for viewing/hiding the 'save selection' button in the protocol Viewer. Added control in ftl file.