fixed and styled wizard page
Merge branch 'devel' of github.com:globaleaks/GLClient into devel

Conflicts:
	app/scripts/controllers/admin/contexts.js
	app/scripts/controllers/wizard.js