Moved jsp library for jetty to profile development
Merge branch 'master' into develop
Merge branch 'master' into develop
fixed conflicts
Finish tags/Release