merged code from Allen
merged with upstream master, updated to rails 3.2.14 and reverted English translations