[#1173755] change PdP domain to paneladepressao.meurio.org.br
Merge branch 'ssi'
[#1173755] remove branch ssi from travis.yml
Fix migration
Fix migration
Fix migration
Fix migration
[#1173755] fix conflicts
Fix user avatar and facebook like button
Change phone masks
Reset sessions
Merge branch 'master' of github.com:meurio/panela-de-pressao
Merge branch 'ssi2' of github.com:meurio/panela-de-pressao into ssi2
Merge branch 'master' into ssi2
Merge branch 'ssi2' of github.com:meurio/panela-de-pressao into ssi2

Conflicts:
	config/initializers/session_store.rb
[#1164193] change current_user to get user_id from session; change User development database; remove Facebook login button