experimented with ajax on upload
resolved merge conflicts
integrated flat ui into the asset pipeline
Merge branch 'master' into admin
Merge branch 'admin'
fixed user ordering
Merge branch 'admin'