Issue #41 #97 new branch
Issue #41 Merge branch 'master' into C2_mohammad-abdulkhaliq_#41/#97_tags

Conflicts:
	Idearator/config/routes.rb
Issue #41 #97 route fix
Merge pull request #285 from DevYah/C2_mohammad-abdulkhaliq_#41/#97_tags

Issue #41 #97 new branch