Влил хотфиксы
Всякие настроечные файлы
git ignore list
Delete workspace.xml
Игнор мусора
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.idea/workspace.xml
updating poms for 0.2.4 release
updating poms for 0.2.4 release
Merge branch 'release/0.2.4'