rakeupdate
Merge branch 'dev' of github.com:lambro/Project2RSS into dev