removed macros from specs. added additional models needed for admin panel, added inheritance gem to keep controllers light.