fix bugs and add list to privacy policy text
use same order as projects search for channel projects index
Merge pull request #701 from pedromarins/privacy-policy

fix bugs and add list to privacy policy text
Merge pull request #702 from adrianob/translation_fixes

Translation fixes
Merge pull request #703 from adrianob/channel_order

use same order as projects search for channel projects index
adding links to text
fixing small details on desktop and mobile presentation
upgraded ruby version to 2.1.2
Upgraded rails to 4.1.1, fixed moip-ruby version to avoid problems with MoIP API, changed feedzira to feedjira.
changed .scoped for .all (scoped was removed in rails 4.1)
added hack to make state_machine work with rails. let's consider migrating to aasm
Fixed has_and_belongs_to_many problem using has_many through instead. We already had an intermediary model.
fixed video handler, now the // comes in the video_embed_url method
Merge pull request #704 from pedromarins/privacy-policy

fixing small details on desktop and mobile presentation
text and style changes missing
Merge pull request #705 from pedromarins/privacy-policy

text and style changes missing
fixed another video spec. now URL always comes with //
removed nonexistent images from SASS
fixed problem with render_to_string in rails 4.1
added comments pointing to issue in github on fix_render_to_string initializer