[#62322604] trying new bootstrap gem
[#62322604] set active link style and set correct margins
Merge remote-tracking branch 'origin/master' into 62322604-same-navbar
[#62322604] collapse the correct navbar
[#62322604] image showing in collapsed menu
[#62322604] add PADMA logo with root url
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into 62322604-same-navbar
[#62322604] ensure bootstrap gem version
[#62322604] fix logo height and navbar height
Merge remote-tracking branch 'origin/master' into 62322604-same-navbar
[#62322604] updated styles to match CRM menu
[#62322604] dinamic links
[#62322604] bootstrap 3 button styles
[#62322604] override bootstraps new line in date pick
[#62322604] buttons and forms to bootstrap 3
[#62322604] select, buttons and checkboxes to comply with bootstrap 3
conflicts resolved