updating tags
updating tags
Merge branch 'develop' of github.com:avalonmediasystem/avalon into develop

Conflicts:
	Gemfile