view-state updates
Merge branch 'master' of github.com:Mackingzie/Avalaunch

Conflicts:
	application/views/menus/header.php
	js/flow.js