merged
fix of indenting on erb
fix up of admin call paths