Merge branch 'master' of https://github.com/remowashere/fs

Conflicts:
	caching/aaf3c58acc2c7f4451f91c44c77dc974789ea7c9.footer.tpl.php
	caching/c3cc9c27d8cec3c53cb1a9719a170ae4be14bbdb.index.tpl.php
	caching/d6a557adf4cb97d1723f59c24d076a5dfc3aba21.header.tpl.php
	modules/phpBB3/cache/data_global.php
	modules/phpBB3/cache/sql_690afb6195236ed55a359b2c70c93566.php
	modules/phpBB3/cache/sql_9dc91161799801b44926b824ccc5cf51.php
.gitignore update
local updates
database connection
Merge branch 'master' of https://github.com/remowashere/fs

Conflicts:
	.gitignore
fixed merge