add wallabag instead of pocket, replace getpocket.rake by getfeed.rake
minors fixes
minors fixes
Merge branch 'master' of heroku.com:devsquare

Conflicts:
	lib/tasks/getfeed.rake
Merge branch 'master' of heroku.com:devsquare

Conflicts:
	lib/tasks/getfeed.rake
Merge branch 'master' of heroku.com:devsquare

Conflicts:
	lib/tasks/getfeed.rake
encode iso utf8 for pg
encode iso utf8 for pg
Merge branch 'master' of heroku.com:devsquare

Conflicts:
	lib/tasks/getfeed.rake
Merge branch 'master' of heroku.com:devsquare

Conflicts:
	lib/tasks/getfeed.rake
merge fixed
asset production + rescue feed for sentiment
default fr small front
rake private method
seeds.rb
video button
Readme
time local
small photo + coquilles CV
Merge branch 'heroku'