- about us page
Merge branch 'master' of https://github.com/rmuhamedgaliev/Planstery-Portal

Conflicts:
	src/main/webapp/WEB-INF/views/index.jsp