Merge branch 'testing' into 0.9.x

diff --cc classes/statusnet.ini
Simple merge

diff --cc db/statusnet.sql
Simple merge

diff --cc js/util.js
Simple merge

diff --cc lib/default.php
Simple merge