Update to rails 3.2.15
Basic admin functionality
Merge