Minors
Merge branch 'master' of github.com:abeiro/ascore-v1

Conflicts:
	.htaccess
	Framework/conf.php