some problems with qTranslate
Merge branch 'master' of https://github.com/21AK/starter

Conflicts:
	page-custom.php