Lolipop
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into trunk

Conflicts:
	README.md