Complete footer without checking
Merge branch 'master' of ssh://github.com/jpacom/jpa7

Conflicts:
	inc/stylesheet/global.css