commit for merge
Merge branch 'master' of github.com:gnibl/gnibl
Committing to prepare for merge. Gnibl modal ok, awaiting comments, inline gnibbing cannot be done in ajax manner for now, rails does not support file upload through ajax. Will look into jquery alternative