Prep 2.1
Merge develop -> master, start 2.2 release

Conflicts:
	launcher.php
	readme.txt
2.2
Merge branch develop -> master for 2.3 and resolve conflicts

Conflicts:
	launcher.php
2.3: update readme
Remove ref to admin menu screenshot
Correct readme.txt for wp.org
Setup 2.4dev