Initial commit
Merge branch 'develop'

Conflicts:
	README.md
cleaned for code freeze
Merge remote-tracking branch 'origin/develop'

Conflicts:
	MicroBlogPortlet/pom.xml
	MicroBlogPortlet/src/main/java/ua/dp/stud/microblog/controller/MicroBlogController.java
	NewsArchivePortlet/pom.xml
	NewsArchivePortlet/src/main/java/ua/dp/stud/newsArchive/controller/NewsController.java
	Studie/pom.xml
Merge branch 'develop'
Merge branch 'master' of https://github.com/es-stud-dp-ua/stud-portal
for code freeze
clear master
Code freez
code freeze
code freeze
code freeze
code freeze
code freeze
code freeze
code freeze
code freeze
code freeze
code freeze
code freeze