Intellij specific files
GUi changes to fix the sizes
(cherry picked from commit 5639124)
GUi changes to fix the sizes
(cherry picked from commit 5639124)
Jquery Ui integration
Merge remote-tracking branch 'origin/base' into base

Conflicts:
	src/main/webapp/css/style.css