Merge remote branch 'upstream/master'
Merge branch 'master' of github.com:mexon/friendica
Merge remote branch 'upstream/master'
Merge branch 'master' of github.com:mexon/friendica
uimport: check table columns before import
uimport: fix file formatting
Merge remote branch 'upstream/master'
Merge branch 'master' of github.com:mexon/friendica
rev update
Merge https://github.com/friendica/friendica into pull
Merge pull request #660 from fabrixxm/moveme

uimport: check table columns before import
DE: update to the strings
sync username when changed in either the default profile or the settings page
Merge https://github.com/friendica/friendica into pull
update admin options for frost, frost mobile, and decaf mobile
Merge pull request #661 from fermionic/20130404-update-frost-decaf

update admin options for frost, frost mobile, and decaf mobile
DE: update to the strings
allow visiting other people's display/ links if I have a copy of the post
Merge pull request #662 from fermionic/20130407-display-own-post

allow visiting other people's display/ links if I have a copy of the post
uimport remove db scheme version check