Merge pull request #1 from ncgroup4/dev

Merge branch
Merge pull request #2 from ncgroup4/dev

Dev
Дизайн главной страницы, вспомогательные страницы и болванка jsp
Исправления
Merge pull request #3 from ncgroup4/dev

Dev
оборачивание jsp in bootstrap (в процессе)
Рефакторинг
Merge remote-tracking branch 'origin/dev'

Conflicts:
	war/WEB-INF/pages/appFormView.jsp
	war/WEB-INF/pages/index2.jsp
	war/WEB-INF/pages/showTypeView.jsp
	war/WEB-INF/pages/sidebar.jsp
	war/resources/css/style.css