Fixes merge issues
builds out the menu cms
The stuff I have
Added a module with some path building helper methods.
Fixes broken class methods (for include).
adds style to cms
Fixes merge conflicts
Fixes app.rb
Fixes missing end statement
Fixes merge conflicts