2
Merge branch 'master' of https://github.com/Andris91/SDI

Conflicts:
	BugTrackerCommon/src/settings/SettingManager.java
asd
qwe
Merge branch 'master' of https://github.com/Andris91/SDI.git
nice
Merge branch 'master' of https://github.com/Andris91/SDI.git