Merge branch 'testing' of git://github.com/molgenis/molgenis_apps into fwn-production
Merge branch 'testing' of git://github.com/molgenis/molgenis_apps
Merge branch 'testing' of git://github.com/molgenis/molgenis_apps
Merge branch 'master' of git://github.com/RoanKanninga/molgenis_apps
Merge branch 'testing' of git://github.com/molgenis/molgenis_apps
Merge branch 'testing' of git://github.com/molgenis/molgenis_apps
Add import time stamp to imported animals.
Merge branch 'testing' of git://github.com/molgenis/molgenis_apps
increase the performance of the algorithms and refectored all the relevent classes
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
Merge branch 'testing' of git://github.com/molgenis/molgenis_apps
Marked import bug with FIXME comment.
created JSONProtocol, feature and category in order to use Gson() to create the JSON in handling ajax request;cleaned up the code and user interface
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
new plugin in cbm that upload an xml file.
Added standalone in build
Changed default value of datadirectory param
parsing a node of participantCollectionSummary
Creating a Participant_Collection_Summary in DB
Merge branch 'testing' of git://github.com/molgenis/molgenis_apps