Adds support for sorting @property in obj-c
Merge remote-tracking branch 'origin/master' into feature/block_enhance

Conflicts:
	src/combine.cpp
	src/options.cpp
	src/options.h