Merge branch 'release/0.8.5' into dev
Merge branch 'master' of github.com:hasadna/ok-qa into dev
fixing public profile
Merge branch 'master' of github.com:hasadna/ok-qa into dev
Fixing edit button, #247
Fixing the following machine
add maale avak stats to json
change user profile url not to be on root to avoid conflicts
remove unused imports
remove commented deprecated code
fix json call in cbs stats
fix json call in cbs stats - load staticfiles
hide 0 stats from locality, fixing #246
remove kol haaretz, fixing #252
change search placeholder to include locality name, fixing #260
fixate django-social-auth in requirements.txt to prevent travis from breaking
remove details from question list, fixing #248
fix user urls, add number of council seats to stats
More TODO!
Merge branch 'tomer-dev' into dev