FAQ: Deleted old deprecated database code
FAQ: Deleted old deprecated database code
Analytics: add workaround for the token collision.
Merge pull request #631 from forkcms/workaround-google-token-collision

Analytics: add workaround for the token collision.
Preparing for release
Corrected amount of sample comments in blog
Updated changelog
Bugfix: CSS style syntax error

Added semicolon
Merge pull request #651 from bart-lysander/patch-6

Bugfix: CSS style syntax error
Merge remote-tracking branch 'upstream/master'

Conflicts:
	VERSION.md
	backend/modules/faq/engine/model.php