pull 1 - Rails 3.2.13 ruby 2.0.0

rails-3.2.13-ruby-2.0.0 can be merged back to master without much risk. 

one is the static top nav bar in layout - the tool bar

the other is get rid of old fashion .css - using the scss instead to make our life easier