Merge branch 'master' of https://github.com/codexa/pictroid
html5 footer upgrade
Merge branch 'master' of https://github.com/codexa/pictroid

Conflicts:
	public/stylesheets/style.css
Merge branch 'master' of https://github.com/codexa/pictroid