updated mergecheck project
Merge branch 'master' of http://github.com/blazdivjak/mpsp2013FRI

Conflicts:
	MergeCheck/SCA-INF/classes/.data/00000000/00000000.jdb
Merge branch 'master' of http://github.com/blazdivjak/mpsp2013FRI