Merge branches 'master' and 'master' of https://github.com/friendica/friendica
Merge branches 'master' and 'master' of https://github.com/friendica/friendica
Vier: added template for vcard
add write access to view/smarty3/ as a requirement for the installer
Merge branch 'master' of https://github.com/friendica/friendica
The caches are now cleared only once an hour.
Merge branch 'master' of https://github.com/friendica/friendica
Merge pull request #557 from fermionic/20121224-installer-check-for-smarty3

add write access to view/smarty3/ as a requirement for the installer
rev update
Merge https://github.com/friendica/friendica into pull
remove dashes from variable names in profile_vcard.tpl
fix profile_vcard all themes
Vier: Now the language of a post is shown
Merge branch 'master' of https://github.com/friendica/friendica
api: add 'allow_api' to user authenticated via oauth
Merge pull request #564 from fabrixxm/master

fix small bug to oauth authentication
remove more dashes in templates
Merge pull request #565 from fermionic/20121227-eliminate-template-dashes

remove more dashes in templates
incremental improvements
update smarty templates