Merge branch 'release/sunnyspring'
fix instant notification template
Merge remote-tracking branch 'upstream/release/sunnyspring' into release/questions-fixes
Merge branch 'release/questions-fixes' into upstream/release/sunnyspring
Update askbot version
Merge remote-tracking branches 'upstream' and 'upstream/release/sunnyspring' into develop