Fixed exports
removed jsp dependency
Merge remote-tracking branch 'origin/develop' into develop