added tifn project
fix merge
fix merging
fixing merge
corrected a typo in the comment
UI fixes
change scope of mysql connector lib from compile --> runtime
added a new spinner and fixed a tiny bug
Merge branch 'master' of https://github.com/molgenis/molgenis
merged function buildTree and createNode. The tree is initialized using object instead of html element. The first two nodes are passed to the (chldren) argument in dynatree.
resolve merge
Merge pull request #20 from ChaoPang/master

Polished the catalogueTree plugin
fixed a tiny bug where the retrieved nodes after searching could cause an error when being inserted in the tree
Merge pull request #21 from ChaoPang/master

Fixed a tiny bug of cataloguetree
Use magic JPA function to get object directly.
specify the text of spinner for different functions.
Merge branch 'master' of https://github.com/molgenis/molgenis
fix error in pom.xml
Merge pull request #22 from ChaoPang/master

Polished the catalogueTree plugin controller
remove bidirectional relationships