Merge origin/master

Conflicts:
	.htaccess
Merge origin/master