some change in jsp
some chahge in views
Merge branch 'salidinov2'