languages.php and clean urls htaccess.
Merge branch 'master' of github.com:brownrl/skeleton

Conflicts:
	inc/languages.php