Added shortcode for next and submits
Merge branch 'master' of github.com:jaylett/newspan2

Conflicts:
	static/js/base.js