analytics
config voor analytics
Google Analytics
config
changed db to mysqli
With favicon
Commented out local database for FTP upload
cakePHP directory added
fixed height of like button
fixed merge conflict
fixed bug in fb button
fixed bug in fb button
Merge branch 'master' into development

Conflicts:
	config.php