Added support for HTC One (m7, m7_ul, cm_m7)
Merge branch 'patch-1' of github.com:dzej1/MultiROMMgr into dzej1-patch-1

Conflicts:
	MultiROMMgr/src/main/assets/devices.json
Merge branch 'dzej1-patch-1'
Merge branch 'master' of github.com:Tasssadar/MultiROMMgr