Update mockup
Merge branch 'master' of https://github.com/voer-platform/vp.web

Conflicts:
	mockup/css/style.css
Update VOER API