Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/Boss.cpp

ildan