Updated for next button on RHS
Merge branch 'master' of https://github.com/cjenkin/osma

Conflicts:
	functions.php