edit layout
Merge branch 'master' of github.com:neontribe/gbptm-ui

Conflicts:
	views/pages/edit.html
	views/pages/signin.html
Merge branch 'master' of github.com:neontribe/gbptm-ui