Local Merge branch 'merge-tyler-pr'
https://github.com/volusion-angular-themes/method/pull/79
Fixes CSS form labels
Merge branch 'master' of https://github.com/volusion-angular-themes/method

Fixed conflicts:
	app/styles/main.scss