Merging last changes
Merge branch 'master' of https://github.com/mprinc/Bujad

Conflicts:
	.project