Merge branch 'master' into C1_Sameh_#78_facebook_sharing
Issue #78, Merge with latest master
Conflicts:
	Idearator/app/models/idea.rb
Issue #78, Add UML and no Documentation to add
Merge branch 'C1_Sameh_#76_twitter_sharing' into C1_Sameh_#78_facebook_sharing
Merge branch 'master' into C1_Sameh_#78_facebook_sharing
Merge branch 'master' into C1_Sameh_#78_facebook_sharing
Merge branch 'master' into C1_Sameh_#78_facebook_sharing
Merge branch 'C1_Sameh_#76_twitter_sharing' into C1_Sameh_#78_facebook_sharing
Merge branch 'C1_Sameh_#76_twitter_sharing' into C1_Sameh_#78_facebook_sharing
Issue #78, Fix documentation.
Issue #78, Fix Indentation
Issue #78, Add documentation on javascript method
Merge branch 'C1_Sameh_#78_facebook_sharing' into C1_Sameh_#76_twitter_sharing

Conflicts:
	Idearator/app/assets/javascripts/ideas.js