Added more step 2 layout
Merge localOrigin/master

Conflicts:
	www/js/controllers.js