upratanieAadresaru
Merge branch 'master' of https://github.com/MichalGallovic/iia-timak

Conflicts:
	database/dump.sql
	database/iia-timak_2014-12-16.sql
	server/database/a.sql