http addID ja editID integroitu.
Merge branch 'master' of http://github.com/sampoz/sdp12

Conflicts:
	Titanium-UI/src/datalogic/DataMaster.java