reset tags method
Merge branch 'develop'

Conflicts:
	controllers/tagsController.js