Merge branch 'develop', remote-tracking branch 'origin'
added ordering, related names and other stuff
added type field to tags
added automatic tagging
added migrations for type