removed ubuntu
Merge branch 'master' into ubuntu

Conflicts:
	huggle/huggle.pro