Adding changes done to the system
Merge branch 'master' of github.com:idega/is.idega.idegaweb.msi

Conflicts:
	.classpath