Add view based entity tagging logic
Remove empty lines
Merge branch 'develop' of git:Minerva/python/minerva into develop