Merge branch 'stage' into master
Disallow access of git directories
<Directory> was not allowed, trying <Files>
Doing .git protection with mod_rewrite instead
Merge branch 'stage' into master

Conflicts:
	.htaccess
Merge branch 'refs/heads/stage'
Merge branch 'stage' into master
Merge branch 'stage' into master
Merge branch 'stage' into master
Merge branch 'stage' into master
Merge branch 'stage' into master
Merge branch 'stage' into master
Merge branch 'stage' into master
Merge branch 'stage'
Merge branch 'stage'
Merge branch 'stage'
Set all iframes to max-width: 100%