initial startup
initial startup
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	application/layouts/scripts/layout.phtml
	application/views/scripts/auth/signup.phtml
	application/views/scripts/user/index.phtml