Begin use of jsession - NOT WORKING YET
Begin use of jsession - NOT WORKING YET
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	helper.php
Force merge of jsession branch