Lost of changes

work still in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	Allegro.pro
	Allegro.pro.user
	allergomainwin.cpp
	allergomainwin.ui
Merge remote-tracking branch 'origin/master'

Conflicts:
	Allegro.pro
	Allegro.pro.user
	allergomainwin.cpp