edit channel plus other
Merge branch 'master' of http://github.com/markthor/RentIt