change log display for tag syncing
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	controllers/tagsController.js
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' into develop