damn
Merge branch 'master' of https://github.com/Echie/TietokannatHT

Conflicts:
	TietokannatHT.pro.user