Merge development into master, Upgrades Rails to 3.2.11 for important security fixs