Merged branch

Signed-off-by: PATRICK IWANICKI <patrick@screengroove.com>
STEP3: Consolidate CC / Address into 1 column

Signed-off-by: PATRICK IWANICKI <patrick@screengroove.com>
Testing remote patrick branch

Signed-off-by: PATRICK IWANICKI <patrick@screengroove.com>
Merge branch 'wilson' of github.com:screengroove/CHECKOUT_1.5
Add phone popover tip

Signed-off-by: PATRICK IWANICKI <patrick@screengroove.com>
Merge branch 'wilson' of github.com:screengroove/CHECKOUT_1.5

Signed-off-by: PATRICK IWANICKI <patrick@screengroove.com>

Conflicts:
	step-0.html
Merge resolve

Signed-off-by: PATRICK IWANICKI <patrick@screengroove.com>
Checkout ~85% complete?