Merge branch 'master' of https://github.com/JeLe/ElvisIsNotDead

Conflicts:
	style/commun.css
?