TagParse fixed
Reworked tag service
Merge branch 'master' of https://github.com/markvanhoscheid/bookshelf