Implemented token submission
Merge remote-tracking branch 'origin/simplify_gamal' into simplify_gamal

Conflicts:
	public/js/controllers.js