Changes in index.css for merge
Merge branch 'master' of github.com:okinoz/sample_app
resposibilities changes and tags
Merge branch 'master' of github.com:okinoz/sample_app
Changes in resume/index layout and some styles have been added in index.css
Merge branch 'master' of github.com:okinoz/sample_app
xMerge branch 'oesparza'
Changes in the layout modifing the index.css and application.js adding a method to set the height for the sidebar
Merge
Merge branch 'master' of github.com:okinoz/sample_app
Education OK
Merge branch 'master' of github.com:okinoz/sample_app
Merge branch 'master' of github.com:okinoz/sample_app
fix filters and issues related to login action