Updated FAQ
Server: updated Twitter bootstrap
Updated embedded documentation
Formatting
Added restriction for Google Analytics
Updated changelog
Merge branch 'master' of github.com:M66B/XPrivacy

Conflicts:
	CHANGELOG.md
Revert "Added restriction for Google Analytics"

This reverts commit 84bfd2e216acba1377333a634592a28af858e3b1.

Conflicts:
	CHANGELOG.md
merge