- start markup of index page
Merge branch 'master' of github.com:rmuhamedgaliev/Planstery-Portal into Index_Page_Markup

Conflicts:
	.idea/libraries/commons_fileupload_1_2_2.xml
- fixed merge
-markup of index page
Merge branch 'Index_Page_Markup' of https://github.com/rmuhamedgaliev/Planstery-Portal into Index_Page_Markup

Conflicts:
	src/main/resources/Planstery-Portal-servlet.xml
- fixed xml
- index page markup
-markup index page
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/Planstery-Portal-servlet.xml