[#1173755] fix conflicts
Merge branch 'ssi2' of github.com:meurio/panela-de-pressao into ssi2
Merge branch 'master' into ssi2
Debug session
Change secret token and session store
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
Fix user database conection
Rollback user login and starting from beginning
All tests working, now let's start the real work
Replace Facebook login with Meu Rio Accounts
Add default MR's header
Change header apps layout
Update icomoon
Merge with ssi2
Fix header
Dudu changes