commits working
working
working
fix livefeed; delete jquery-file-uload
add upload/public to ignore
remove images
merged