[] reorganizing step list view
[] merge
Merge branch 'master' of https://github.com/mpaddon/iFixitAndroid

Conflicts:
	App/res/values/strings.xml
[] prop lineendings