Merge branch 'master' of https://github.com/jmnsf/catalog

Conflicts:
	Gemfile.lock
Adds Tag to Label association through name.
Adds name to Label.
Adds a factory for Labels.
Adds tests for Label and Tag relations.