Merge branch 'hotfix/0.4.1.1'
bump Rails to fix CVE-2014-7818
Merge branch 'hotfix/0.4.1.2' into develop

Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
XMPP diaspora chat feature

open tasks:
* mixed content; writing reverse proxy for rails application?!
* design tweaks (smiles are broken)
* login with user credentials from external (authentication works; something else broken?!)
* pod federation (was not tested yet)
* make jappix text translatable
* history / offline messages (we probably want that?!)

Vines is located here zauberstuhl/diaspora-vines
Jappix is located here zauberstuhl/bower-jappix-mini
Removed obsolete files and configured default values
Workaround for unknown function in production mode
Fails cause I am using a token system
Removed vines cert directory
Added database provider for AppConfig
Vine tweaks for v0.1.1
Added cert and key config for chat encryption
Updated vines to version 0.1.1
Re-implemented reset_authentication_token

In respect of an unclean logout process
we reset the token on sign in and sign out
Updated vines configuration for 0.1.1
Added database tables for xmpp server

To fully support external clients it should be
also possible to save non-diaspora contacts
Keys ending in ? are resolved automatically
Disable chat on default
Removed placeholder and added README file for vines certs
Removed database configuration from AppConfig

related to diaspora/vines#15
Using bundle for exec vines