Update application to ruby 2.0, rails 3.2.11
Merge