Merge branch 'master' of github.com:hatchteam/twigs into develop
#25 tablerow click is prevented if nested link is clicked
Merge branch 'develop'
#25 increased version for release