Changed top nav color
resolved merge conflict
integrated flat ui into the asset pipeline
resolved merge conflict
Merge branch 'admin'
Merge branch 'admin'
working with ajaxifying interface