setail pages
Merge branch 'master' of github.com:projects4PB/ziowebapp

Conflicts:
	static/css/main.css