update proj
Merge remote-tracking branch '__template__/master'

Conflicts:
	.cproject
	.settings/language.settings.xml
	waf

Signed-off-by: psi <ledyba@users.sourceforge.jp>