API: Support of privacy_image_cache - if enabled
API: Support of privacy_image_cache for calls without entities added
The icon for the website is now changeable in the config
Merge remote-tracking branch 'upstream/master'
Vier: Preview picture in admin settings is now smaller
added vagrant configuration for running a friendica development instance
adjusted configuration due to problems with mailcatcher
remove NFS option for vagrant folder as this doesn't work on windows machines
Merge pull request #1028 from tugelbend/master

Vagrant configuration to instantiate development boxes easily
don't add http:// if homepage is not set
Merge pull request #1029 from tobiasd/fix1027

don't add http:// if homepage is not set
redo util/message.po
Merge pull request #1030 from tobiasd/20140622

renew master message.po
The temporary paths (temp, lock, itemcache) are now detected automatically when used.
markdown export for libertree now handles horizontal tulers correct.
dbstructure: the indexes for longer table fields are now shortened
Merge pull request #1033 from annando/master

Temporary paths are now defined automatically