Merge branch 'master' of github.com:NanoCAN/OpenLabFramework

Merging necessary because of updated readme.md

Author: mlist

README.md

@@ -0,0 +1,27 @@
+OpenLabFramework
+================
+
+OpenLabFramework (OLF) is a groovy & grails based open-source laboratory information management system (LIMS) 
+intended for advanced sample management in small to mid-sized laboratories. It has been developed with focus
+on the management of vector clone and genetically engineered cell lines. It can, however, be adapted to cover
+other biomaterials. Thanks to a modular structure and the use of grails, new functionality can be added with
+little developmental effort. Features currently included are among others: 
+
+* Sample management of genes, gene variants, vector clones, and genetically engineered cell-lines,
+* together with information about medium composition, antibiotics and other cell culture conditions.
+* Physical sample tracking with QR barcodes and direct printing of labels using DYMO label printers.
+* Document management where arbitrary files can be uploaded and linked to samples in the database
+* Dynamic web-interface with heavy use of java-script and Ajax with the goal of being more responsive,
+  intuitive, and interactive.
+
+For more information please have a look at the github WIKI where you can find more information for users, 
+administrators, and software developers:
+
+https://github.com/NanoCAN/OpenLabFramework/wiki
+
+For more information about our center, as well as for contact details: http://www.nanocan.org
+
+Release Notes:
+
+v. 1.1 First public release
+