xkjc
Merge branch 'master' of https://github.com/JoveI/KI

Conflicts:
	ArheoloskiNaog/ArheoloskiNaog.v12.suo
	ArheoloskiNaog/ArheoloskiNaog/App_Data/Arheologija.mdf
	ArheoloskiNaog/ArheoloskiNaog/App_Data/Arheologija_log.ldf