Checkin before pull.
Merge branch 'master' of https://github.com/jebreimo/CLAPGen

Conflicts:
	clapgen/argparser_cpp.py
	clapgen/argparser_hpp.py
	clapgen/constants.py
	clapgen/helptextparser.py
	clapgen/properties.py