Tags, views/devise, moderator_controller
Merge branch 'develop' into issue_6_and_tags

Conflicts:
	spec/models/tag_spec.rb
removed unused factory, and switched off tests for controllers
Merge pull request #20 from LambdaTeamAtBursa/issue_6_and_tags

Issue 6 and tags