Fix ondemand and remove all refs of s2w but keep BB Mod
Update readme
Updated Readme.md again (IGNORE)
Merge branch 'master' of github.com:Lens-F/m7-aosp-revised

Conflicts:
	README.md